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

refactor: cargo clippy --fix

Browse Source 
Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
This commit is contained in:
Thomas Mühlbacher 2024-05-22 22:17:04 +02:00
parent 3ac510f6a4
commit 3488d4f15f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/commands/mount.rs
View File

@ -50,7 +50,7 @@ fn parse_mount_options(options: impl AsRef<str>) -> (Option<String>, libc::c_ulo
debug!("parsing mount options: {}", options.as_ref()); debug!("parsing mount options: {}", options.as_ref());
let (opts, flags) = options let (opts, flags) = options
.as_ref() .as_ref()
.split(",") .split(',')
.map(|o| match o { .map(|o| match o {
"dirsync" => Left(libc::MS_DIRSYNC), "dirsync" => Left(libc::MS_DIRSYNC),
"lazytime" => Left(1 << 25), // MS_LAZYTIME "lazytime" => Left(1 << 25), // MS_LAZYTIME
@ -67,7 +67,7 @@ fn parse_mount_options(options: impl AsRef<str>) -> (Option<String>, libc::c_ulo
"strictatime" => Left(libc::MS_STRICTATIME), "strictatime" => Left(libc::MS_STRICTATIME),
"sync" => Left(libc::MS_SYNCHRONOUS), "sync" => Left(libc::MS_SYNCHRONOUS),
"" => Left(0), "" => Left(0),
o @ _ => Right(o), o => Right(o),
}) })
.fold((Vec::new(), 0), |(mut opts, flags), next| match next { .fold((Vec::new(), 0), |(mut opts, flags), next| match next {
Left(f) => (opts, flags | f), Left(f) => (opts, flags | f),
@ -78,7 +78,7 @@ fn parse_mount_options(options: impl AsRef<str>) -> (Option<String>, libc::c_ulo
}); });
( (
if opts.len() == 0 { if opts.is_empty() {
None None
} else { } else {
Some(opts.join(",")) Some(opts.join(","))
@ -105,7 +105,7 @@ fn read_super_silent(path: &std::path::PathBuf) -> anyhow::Result<bch_sb_handle>
let mut opts = bcachefs::bch_opts::default(); let mut opts = bcachefs::bch_opts::default();
opt_set!(opts, noexcl, 1); opt_set!(opts, noexcl, 1);
bch_bindgen::sb_io::read_super_silent(&path, opts) bch_bindgen::sb_io::read_super_silent(path, opts)
} }
fn device_property_map(dev: &udev::Device) -> HashMap<String, String> { fn device_property_map(dev: &udev::Device) -> HashMap<String, String> {
@ -327,7 +327,7 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> {
// If they supply a single device it could be either the FS only has 1 device or it's // If they supply a single device it could be either the FS only has 1 device or it's
// only 1 of a number of devices which are part of the FS. This appears to be the case // only 1 of a number of devices which are part of the FS. This appears to be the case
// when we get called during fstab mount processing and the fstab specifies a UUID. // when we get called during fstab mount processing and the fstab specifies a UUID.
if opt.dev.contains(":") { if opt.dev.contains(':') {
let mut block_devices_to_mount = Vec::new(); let mut block_devices_to_mount = Vec::new();
for dev in opt.dev.split(':') { for dev in opt.dev.split(':') {
@ -341,7 +341,7 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> {
} }
}; };
if block_devices_to_mount.len() == 0 { if block_devices_to_mount.is_empty() {
Err(anyhow::anyhow!("No device found from specified parameters"))?; Err(anyhow::anyhow!("No device found from specified parameters"))?;
} }
// Check if the filesystem's master key is encrypted // Check if the filesystem's master key is encrypted

6
src/key.rs
View File

@ -118,13 +118,13 @@ fn unlock_master_key(sb: &bch_sb_handle, passphrase: &String) -> anyhow::Result<
) )
}; };
let mut key = crypt.key().clone(); let mut key = *crypt.key();
let ret = unsafe { let ret = unsafe {
bch2_chacha_encrypt_key( bch2_chacha_encrypt_key(
&mut output as *mut _, &mut output as *mut _,
sb.sb().nonce(), sb.sb().nonce(),
&mut key as *mut _ as *mut _, &mut key as *mut _ as *mut _,
std::mem::size_of::<bch_encrypted_key>() as usize, std::mem::size_of::<bch_encrypted_key>(),
) )
}; };
if ret != 0 { if ret != 0 {
@ -138,7 +138,7 @@ fn unlock_master_key(sb: &bch_sb_handle, passphrase: &String) -> anyhow::Result<
key_type, key_type,
key_name.as_c_str().to_bytes_with_nul() as *const _ as *const c_char, key_name.as_c_str().to_bytes_with_nul() as *const _ as *const c_char,
&output as *const _ as *const _, &output as *const _ as *const _,
std::mem::size_of::<bch_key>() as usize, std::mem::size_of::<bch_key>(),
bch_bindgen::keyutils::KEY_SPEC_USER_KEYRING, bch_bindgen::keyutils::KEY_SPEC_USER_KEYRING,
) )
}; };