RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: open the devices exclusively for writes 

There is an internal report that, during btrfs-convert to block-group
tree, by accident some systemd events triggered the mount of the target
fs.

This leads to double mount (one by kernel and one by the btrfs-progs),
which seems to cause quite some problems.

To avoid such accident, exclusively opens all devices if btrfs-progs is
doing write operations.

Pull-request: #888
Reported-by: pandada8 <pandada8@gmail.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
This commit is contained in:
Qu Wenruo 2024-09-11 18:38:12 +09:30 committed by David Sterba
parent 08c1e627a8
commit 18ecbfd3dd
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/rescue.c
View File

@ -203,7 +203,7 @@ static int cmd_rescue_zero_log(const struct cmd_struct *cmd,
} }
root = open_ctree(devname, 0, OPEN_CTREE_WRITES | OPEN_CTREE_PARTIAL | root = open_ctree(devname, 0, OPEN_CTREE_WRITES | OPEN_CTREE_PARTIAL |
OPEN_CTREE_NO_BLOCK_GROUPS); OPEN_CTREE_NO_BLOCK_GROUPS | OPEN_CTREE_EXCLUSIVE);
if (!root) { if (!root) {
error("could not open ctree"); error("could not open ctree");
return 1; return 1;
@ -258,7 +258,7 @@ static int cmd_rescue_fix_device_size(const struct cmd_struct *cmd,
} }
oca.filename = devname; oca.filename = devname;
oca.flags = OPEN_CTREE_WRITES | OPEN_CTREE_PARTIAL; oca.flags = OPEN_CTREE_WRITES | OPEN_CTREE_PARTIAL | OPEN_CTREE_EXCLUSIVE;
fs_info = open_ctree_fs_info(&oca); fs_info = open_ctree_fs_info(&oca);
if (!fs_info) { if (!fs_info) {
error("could not open btrfs"); error("could not open btrfs");
@ -437,7 +437,7 @@ static int cmd_rescue_clear_ino_cache(const struct cmd_struct *cmd,
goto out; goto out;
} }
oca.filename = devname; oca.filename = devname;
oca.flags = OPEN_CTREE_WRITES; oca.flags = OPEN_CTREE_WRITES | OPEN_CTREE_EXCLUSIVE;
fs_info = open_ctree_fs_info(&oca); fs_info = open_ctree_fs_info(&oca);
if (!fs_info) { if (!fs_info) {
error("could not open btrfs"); error("could not open btrfs");

3
common/filesystem-utils.c
View File

@ -94,7 +94,8 @@ static int set_label_unmounted(const char *dev, const char *label)
/* Open the super_block at the default location /* Open the super_block at the default location
* and as read-write. * and as read-write.
*/ */
root = open_ctree(dev, 0, OPEN_CTREE_WRITES); root = open_ctree(dev, 0, OPEN_CTREE_WRITES |
OPEN_CTREE_EXCLUSIVE);
if (!root) /* errors are printed by open_ctree() */ if (!root) /* errors are printed by open_ctree() */
return -1; return -1;

3
convert/main.c
View File

@ -1373,7 +1373,8 @@ static int do_convert(const char *devname, u32 convert_flags, u32 nodesize,
btrfs_sb_committed = true; btrfs_sb_committed = true;
root = open_ctree_fd(fd, devname, 0, root = open_ctree_fd(fd, devname, 0,
OPEN_CTREE_WRITES | OPEN_CTREE_TEMPORARY_SUPER); OPEN_CTREE_WRITES | OPEN_CTREE_TEMPORARY_SUPER |
OPEN_CTREE_EXCLUSIVE);
if (!root) { if (!root) {
error("unable to open ctree for finalization"); error("unable to open ctree for finalization");
goto fail; goto fail;

4
image/image-restore.c
View File

@ -1790,7 +1790,8 @@ int restore_metadump(const char *input, FILE *out, int old_restore,
oca.filename = target; oca.filename = target;
oca.flags = OPEN_CTREE_WRITES | OPEN_CTREE_RESTORE | oca.flags = OPEN_CTREE_WRITES | OPEN_CTREE_RESTORE |
OPEN_CTREE_PARTIAL | OPEN_CTREE_SKIP_LEAF_ITEM_CHECKS; OPEN_CTREE_PARTIAL | OPEN_CTREE_SKIP_LEAF_ITEM_CHECKS |
OPEN_CTREE_EXCLUSIVE;
info = open_ctree_fs_info(&oca); info = open_ctree_fs_info(&oca);
if (!info) { if (!info) {
error("open ctree failed"); error("open ctree failed");
@ -1855,6 +1856,7 @@ int restore_metadump(const char *input, FILE *out, int old_restore,
root = open_ctree_fd(fileno(out), target, 0, root = open_ctree_fd(fileno(out), target, 0,
OPEN_CTREE_PARTIAL | OPEN_CTREE_PARTIAL |
OPEN_CTREE_WRITES | OPEN_CTREE_WRITES |
OPEN_CTREE_EXCLUSIVE |
OPEN_CTREE_NO_DEVICES | OPEN_CTREE_NO_DEVICES |
OPEN_CTREE_ALLOW_TRANSID_MISMATCH | OPEN_CTREE_ALLOW_TRANSID_MISMATCH |
OPEN_CTREE_SKIP_LEAF_ITEM_CHECKS); OPEN_CTREE_SKIP_LEAF_ITEM_CHECKS);

3
mkfs/main.c
View File

@ -1666,7 +1666,8 @@ int BOX_MAIN(mkfs)(int argc, char **argv)
} }
oca.filename = file; oca.filename = file;
oca.flags = OPEN_CTREE_WRITES | OPEN_CTREE_TEMPORARY_SUPER; oca.flags = OPEN_CTREE_WRITES | OPEN_CTREE_TEMPORARY_SUPER |
OPEN_CTREE_EXCLUSIVE;
fs_info = open_ctree_fs_info(&oca); fs_info = open_ctree_fs_info(&oca);
if (!fs_info) { if (!fs_info) {
error("open ctree failed"); error("open ctree failed");

2
tune/main.c
View File

@ -185,7 +185,7 @@ int BOX_MAIN(btrfstune)(int argc, char *argv[])
{ {
struct btrfs_root *root; struct btrfs_root *root;
struct btrfs_fs_info *fs_info; struct btrfs_fs_info *fs_info;
unsigned ctree_flags = OPEN_CTREE_WRITES; unsigned ctree_flags = OPEN_CTREE_WRITES | OPEN_CTREE_EXCLUSIVE;
int seeding_flag = 0; int seeding_flag = 0;
u64 seeding_value = 0; u64 seeding_value = 0;
int random_fsid = 0; int random_fsid = 0;