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

style: nix fmt

Browse Source 
Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
This commit is contained in:
Thomas Mühlbacher 2024-07-19 23:00:27 +02:00
parent e218119b01
commit 7c68f2758d
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/commands/mount.rs
View File

@ -48,7 +48,10 @@ fn mount_inner(
let err = errno::errno().0; let err = errno::errno().0;
if ret == 0 || (err != libc::EACCES && err != libc::EROFS) || (mountflags & libc::MS_RDONLY) != 0 { if ret == 0
|| (err != libc::EACCES && err != libc::EROFS)
|| (mountflags & libc::MS_RDONLY) != 0
{
break; break;
} }
@ -333,25 +336,26 @@ fn cmd_mount_inner(cli: &Cli) -> Result<()> {
// Grab the udev information once // Grab the udev information once
let udev_info = udev_bcachefs_info()?; let udev_info = udev_bcachefs_info()?;
let (devices, mut sbs) = if let Some(("UUID" | "OLD_BLKID_UUID", uuid)) = cli.dev.split_once('=') { let (devices, mut sbs) =
devs_str_sbs_from_uuid(&udev_info, uuid)? if let Some(("UUID" | "OLD_BLKID_UUID", uuid)) = cli.dev.split_once('=') {
} else if cli.dev.contains(':') { devs_str_sbs_from_uuid(&udev_info, uuid)?
// If the device string contains ":" we will assume the user knows the } else if cli.dev.contains(':') {
// entire list. If they supply a single device it could be either the FS // If the device string contains ":" we will assume the user knows the
// only has 1 device or it's only 1 of a number of devices which are // entire list. If they supply a single device it could be either the FS
// part of the FS. This appears to be the case when we get called during // only has 1 device or it's only 1 of a number of devices which are
// fstab mount processing and the fstab specifies a UUID. // part of the FS. This appears to be the case when we get called during
// fstab mount processing and the fstab specifies a UUID.
let sbs = cli let sbs = cli
.dev .dev
.split(':') .split(':')
.map(read_super_silent) .map(read_super_silent)
.collect::<Result<Vec<_>>>()?; .collect::<Result<Vec<_>>>()?;
(cli.dev.clone(), sbs) (cli.dev.clone(), sbs)
} else { } else {
devs_str_sbs_from_device(&udev_info, Path::new(&cli.dev))? devs_str_sbs_from_device(&udev_info, Path::new(&cli.dev))?
}; };
ensure!(!sbs.is_empty(), "No device(s) to mount specified"); ensure!(!sbs.is_empty(), "No device(s) to mount specified");
@ -361,7 +365,9 @@ fn cmd_mount_inner(cli: &Cli) -> Result<()> {
} }
for sb in &mut sbs { for sb in &mut sbs {
unsafe { bch_bindgen::sb_io::bch2_free_super(sb); } unsafe {
bch_bindgen::sb_io::bch2_free_super(sb);
}
} }
drop(sbs); drop(sbs);