alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-08 00:00:12 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Use bcache_fs_open_fallible in BcachefsHandle::open

Browse Source 
Also, as long as the path is valid, bcache_fs_open{,fallible} do not
do anything unsafe so BcachefsHandle::open does not need to be marked
unsafe.
This commit is contained in:
beviu 2025-09-20 22:15:01 +02:00
parent 235c11e325
commit b5f23b00cd
No known key found for this signature in database
GPG Key ID: C6AAE70FD32E0112
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bch_bindgen/build.rs
View File

@ -53,7 +53,7 @@ fn main() {
.allowlist_function("cmd_.*")
.allowlist_function(".*_cmds")
.allowlist_function(".*bch2_.*")
.allowlist_function("bcache_fs_open")
.allowlist_function("bcache_fs_open_fallible")
.allowlist_function("bcache_fs_close")
.allowlist_function("bio_.*")
.allowlist_function("derive_passphrase")

8
src/commands/subvolume.rs
View File

@ -54,7 +54,8 @@ pub fn subvolume(argv: Vec<String>) -> Result<()> {
};
if let Some(dirname) = target.parent() {
let fs = unsafe { BcachefsHandle::open(dirname) };
let fs =
BcachefsHandle::open(dirname).context("Failed to open the filesystem")?;
fs.create_subvolume(target)
.context("Failed to create the subvolume")?;
}
@ -67,7 +68,8 @@ pub fn subvolume(argv: Vec<String>) -> Result<()> {
.context("subvolume path does not exist or can not be canonicalized")?;
if let Some(dirname) = target.parent() {
let fs = unsafe { BcachefsHandle::open(dirname) };
let fs =
BcachefsHandle::open(dirname).context("Failed to open the filesystem")?;
fs.delete_subvolume(target)
.context("Failed to delete the subvolume")?;
}
@ -85,7 +87,7 @@ pub fn subvolume(argv: Vec<String>) -> Result<()> {
} else {
dirname
};
let fs = unsafe { BcachefsHandle::open(dir) };
let fs = BcachefsHandle::open(dir).context("Failed to open the filesystem")?;
fs.snapshot_subvolume(
if read_only {

20
src/wrappers/handle.rs
View File

@ -1,13 +1,13 @@
use std::mem::MaybeUninit;
use std::path::Path;
use bch_bindgen::c::{
bcache_fs_close, bcache_fs_open, bch_ioctl_subvolume, bch_ioctl_subvolume_v2, bch_ioctl_err_msg, bchfs_handle,
BCH_IOCTL_SUBVOLUME_CREATE,
BCH_IOCTL_SUBVOLUME_CREATE_v2,
BCH_IOCTL_SUBVOLUME_DESTROY,
BCH_IOCTL_SUBVOLUME_DESTROY_v2,
bcache_fs_close, bcache_fs_open_fallible, bch_errcode, bch_ioctl_err_msg, bch_ioctl_subvolume,
bch_ioctl_subvolume_v2, bchfs_handle, BCH_IOCTL_SUBVOLUME_CREATE_v2,
BCH_IOCTL_SUBVOLUME_DESTROY_v2, BCH_IOCTL_SUBVOLUME_CREATE, BCH_IOCTL_SUBVOLUME_DESTROY,
BCH_SUBVOL_SNAPSHOT_CREATE,
};
use bch_bindgen::errcode::ret_to_result;
use bch_bindgen::path_to_cstr;
use errno::Errno;
@ -19,12 +19,12 @@ pub(crate) struct BcachefsHandle {
impl BcachefsHandle {
/// Opens a bcachefs filesystem and returns its handle
/// TODO(raitobezarius): how can this not be faillible?
pub(crate) unsafe fn open<P: AsRef<Path>>(path: P) -> Self {
pub(crate) fn open<P: AsRef<Path>>(path: P) -> Result<Self, bch_errcode> {
let path = path_to_cstr(path);
Self {
inner: bcache_fs_open(path.as_ptr()),
}
let mut handle: MaybeUninit<bchfs_handle> = MaybeUninit::uninit();
ret_to_result(unsafe { bcache_fs_open_fallible(path.as_ptr(), handle.as_mut_ptr()) })?;
let inner = unsafe { handle.assume_init() };
Ok(Self { inner })
}
}