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

cmd_subvolume: Fix snapshot creation with implicit source

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-02-05 20:33:10 -05:00
parent 1d39ee23af
commit 1ef396b684
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/commands/cmd_subvolume.rs
View File

@ -22,11 +22,12 @@ enum Subcommands {
/// Path /// Path
target: PathBuf target: PathBuf
}, },
#[command(allow_missing_positional = true)]
Snapshot { Snapshot {
/// Make snapshot read only /// Make snapshot read only
#[arg(long, short = 'r')] #[arg(long, short = 'r')]
read_only: bool, read_only: bool,
source: PathBuf, source: Option<PathBuf>,
dest: PathBuf dest: PathBuf
} }
} }

16
src/wrappers/handle.rs
View File

@ -82,17 +82,23 @@ impl BcachefsHandle {
/// Snapshot a subvolume for this bcachefs filesystem /// Snapshot a subvolume for this bcachefs filesystem
/// at the given path /// at the given path
pub fn snapshot_subvolume<P: AsRef<Path>>(&self, extra_flags: u32, src: P, dst: P) -> Result<(), Errno> { pub fn snapshot_subvolume<P: AsRef<Path>>(&self, extra_flags: u32, src: Option<P>, dst: P) -> Result<(), Errno> {
let src = CString::new(src.as_ref().as_os_str().as_bytes()).expect("Failed to cast source path for subvolume in a C-style string"); let src = src.map(|src| CString::new(src.as_ref().as_os_str().as_bytes()).expect("Failed to cast source path for subvolume in a C-style string"));
let dst = CString::new(dst.as_ref().as_os_str().as_bytes()).expect("Failed to cast destination path for subvolume in a C-style string"); let dst = CString::new(dst.as_ref().as_os_str().as_bytes()).expect("Failed to cast destination path for subvolume in a C-style string");
self.ioctl(BcachefsIoctl::SubvolumeCreate, &BcachefsIoctlPayload::Subvolume(bch_ioctl_subvolume {
let res = self.ioctl(BcachefsIoctl::SubvolumeCreate, &BcachefsIoctlPayload::Subvolume(bch_ioctl_subvolume {
flags: BCH_SUBVOL_SNAPSHOT_CREATE | extra_flags, flags: BCH_SUBVOL_SNAPSHOT_CREATE | extra_flags,
dirfd: libc::AT_FDCWD, dirfd: libc::AT_FDCWD,
mode: 0o777, mode: 0o777,
src_ptr: src.as_ptr() as u64, src_ptr: src.as_ref().map_or(0, |x| x.as_ptr() as u64),
//src_ptr: if let Some(src) = src { src.as_ptr() } else { std::ptr::null() } as u64,
dst_ptr: dst.as_ptr() as u64, dst_ptr: dst.as_ptr() as u64,
..Default::default() ..Default::default()
})) }));
drop(src);
drop(dst);
res
} }
} }