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_mount: Use noxcl for opening block devices

Browse Source 
We're only reading the superblocks, no need for O_EXCL - and this fixes
mounts failing because we're still holding the devices open.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2024-01-13 01:47:33 -05:00
parent 5ed0dcc001
commit 039fd4064a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rust-src/src/cmd_mount.rs
View File

@ -1,5 +1,5 @@
use atty::Stream; 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 log::{info, debug, error, LevelFilter};
use clap::{Parser}; use clap::{Parser};
use uuid::Uuid; use uuid::Uuid;
@ -104,7 +104,10 @@ fn read_super_silent(path: &std::path::PathBuf) -> anyhow::Result<bch_sb_handle>
// Stop libbcachefs from spamming the output // Stop libbcachefs from spamming the output
let _gag = gag::BufferRedirect::stdout().unwrap(); 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)>> { fn get_devices_by_uuid(uuid: Uuid) -> anyhow::Result<Vec<(PathBuf, bch_sb_handle)>> {
@ -188,7 +191,7 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> {
for dev in opt.dev.split(':') { for dev in opt.dev.split(':') {
let dev = PathBuf::from(dev); let dev = PathBuf::from(dev);
sbs.push(bch_bindgen::rs::read_super(&dev)?); sbs.push(read_super_silent(&dev)?);
} }
(opt.dev, sbs) (opt.dev, sbs)