aboutsummaryrefslogtreecommitdiffstats
path: root/volumes.c
diff options
context:
space:
mode:
authorQu Wenruo <quwenruo@cn.fujitsu.com>2015-05-15 14:36:35 +0800
committerDavid Sterba <dsterba@suse.cz>2015-05-26 17:25:10 +0200
commitab747f84cad2047dcc7eb2850f4c9251437eb50b (patch)
treed47b28ee4da946f8af46bd3e739f29e2ca528aa3 /volumes.c
parent99ad3805beed9f527830c2d07118718872224e9f (diff)
downloadbtrfs-progs-ab747f84cad2047dcc7eb2850f4c9251437eb50b.tar.gz
btrfs-progs-ab747f84cad2047dcc7eb2850f4c9251437eb50b.tar.xz
btrfs-progs-ab747f84cad2047dcc7eb2850f4c9251437eb50b.zip
btrfs-progs: btrfstune: fix a bug which makes unfinished fsid change unrecoverable
This bug is found by making break point after change_fsid_prepare() and then kill the unfinished change, then try to restore the unfinished fsid change. If fsid change is canceled, open_ctree will still fail even with IGNORE_FSID_MIMATCH open ctree flag, since it can't find device with mismatched fsid, making it unable to restoring. Now add ignore_fsid_mismatch judgment in btrfs_find_device() to fix the bug and allow later restore to work as expected. Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'volumes.c')
-rw-r--r--volumes.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/volumes.c b/volumes.c
index 14ce33e..f7462c5 100644
--- a/volumes.c
+++ b/volumes.c
@@ -1510,7 +1510,8 @@ struct btrfs_device *btrfs_find_device(struct btrfs_root *root, u64 devid,
cur_devices = root->fs_info->fs_devices;
while (cur_devices) {
if (!fsid ||
- !memcmp(cur_devices->fsid, fsid, BTRFS_UUID_SIZE)) {
+ (!memcmp(cur_devices->fsid, fsid, BTRFS_UUID_SIZE) ||
+ root->fs_info->ignore_fsid_mismatch)) {
device = __find_device(&cur_devices->devices,
devid, uuid);
if (device)