Skip to content

Commit

Permalink
btrfs-progs: open the devices exclusively for writes
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Qu Wenruo <[email protected]>
  • Loading branch information
adam900710 authored and kdave committed Sep 12, 2024
1 parent 17e53fd commit 9a2e024
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
6 changes: 3 additions & 3 deletions cmds/rescue.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
OPEN_CTREE_NO_BLOCK_GROUPS);
OPEN_CTREE_NO_BLOCK_GROUPS | OPEN_CTREE_EXCLUSIVE);
if (!root) {
error("could not open ctree");
return 1;
Expand Down Expand Up @@ -258,7 +258,7 @@ static int cmd_rescue_fix_device_size(const struct cmd_struct *cmd,
}

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);
if (!fs_info) {
error("could not open btrfs");
Expand Down Expand Up @@ -437,7 +437,7 @@ static int cmd_rescue_clear_ino_cache(const struct cmd_struct *cmd,
goto out;
}
oca.filename = devname;
oca.flags = OPEN_CTREE_WRITES;
oca.flags = OPEN_CTREE_WRITES | OPEN_CTREE_EXCLUSIVE;
fs_info = open_ctree_fs_info(&oca);
if (!fs_info) {
error("could not open btrfs");
Expand Down
3 changes: 2 additions & 1 deletion common/filesystem-utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ static int set_label_unmounted(const char *dev, const char *label)
/* Open the super_block at the default location
* 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() */
return -1;

Expand Down
3 changes: 2 additions & 1 deletion convert/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,8 @@ static int do_convert(const char *devname, u32 convert_flags, u32 nodesize,
btrfs_sb_committed = true;

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) {
error("unable to open ctree for finalization");
goto fail;
Expand Down
4 changes: 3 additions & 1 deletion image/image-restore.c
Original file line number Diff line number Diff line change
Expand Up @@ -1790,7 +1790,8 @@ int restore_metadump(const char *input, FILE *out, int old_restore,

oca.filename = target;
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);
if (!info) {
error("open ctree failed");
Expand Down Expand Up @@ -1855,6 +1856,7 @@ int restore_metadump(const char *input, FILE *out, int old_restore,
root = open_ctree_fd(fileno(out), target, 0,
OPEN_CTREE_PARTIAL |
OPEN_CTREE_WRITES |
OPEN_CTREE_EXCLUSIVE |
OPEN_CTREE_NO_DEVICES |
OPEN_CTREE_ALLOW_TRANSID_MISMATCH |
OPEN_CTREE_SKIP_LEAF_ITEM_CHECKS);
Expand Down
3 changes: 2 additions & 1 deletion mkfs/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1846,7 +1846,8 @@ int BOX_MAIN(mkfs)(int argc, char **argv)
}

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);
if (!fs_info) {
error("open ctree failed");
Expand Down
2 changes: 1 addition & 1 deletion tune/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ int BOX_MAIN(btrfstune)(int argc, char *argv[])
{
struct btrfs_root *root;
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;
u64 seeding_value = 0;
int random_fsid = 0;
Expand Down

0 comments on commit 9a2e024

Please sign in to comment.