cmd_mount: Use noxcl for opening block devices

[bcachefs-tools-debian] / rust-src / src / cmd_mount.rs

diff --git a/rust-src/src/cmd_mount.rs b/rust-src/src/cmd_mount.rs
index 3f8253f5e1f56781a22fdf6ee7cf6b0ccacdd85b..eccfe6d0301d2ccb6d4e3d5d63cb3d2373fe2505 100644 (file)
--- a/rust-src/src/cmd_mount.rs
+++ b/rust-src/src/cmd_mount.rs
@@ -1,5 +1,5 @@
 use atty::Stream;
-use bch_bindgen::{bcachefs, bcachefs::bch_sb_handle};
+use bch_bindgen::{bcachefs, bcachefs::bch_sb_handle, opt_set};
 use log::{info, debug, error, LevelFilter};
 use clap::{Parser};
 use uuid::Uuid;
@@ -76,12 +76,11 @@ fn parse_mount_options(options: impl AsRef<str>) -> (Option<String>, libc::c_ulo
             }
         });
 
-    use itertools::Itertools;
     (
         if opts.len() == 0 {
             None
         } else {
-            Some(opts.iter().join(","))
+            Some(opts.join(","))
         },
         flags,
     )
@@ -105,7 +104,10 @@ fn read_super_silent(path: &std::path::PathBuf) -> anyhow::Result<bch_sb_handle>
     // Stop libbcachefs from spamming the output
     let _gag = gag::BufferRedirect::stdout().unwrap();
 
-    bch_bindgen::rs::read_super(&path)
+    let mut opts = bcachefs::bch_opts::default();
+    opt_set!(opts, noexcl, 1);
+
+    bch_bindgen::rs::read_super_opts(&path, opts)
 }
 
 fn get_devices_by_uuid(uuid: Uuid) -> anyhow::Result<Vec<(PathBuf, bch_sb_handle)>> {
@@ -189,7 +191,7 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> {
 
         for dev in opt.dev.split(':') {
             let dev = PathBuf::from(dev);
-            sbs.push(bch_bindgen::rs::read_super(&dev)?);
+            sbs.push(read_super_silent(&dev)?);
         }
 
         (opt.dev, sbs)