mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
synced 2024-11-27 22:24:20 +08:00
btrfs-progs: tune: pass metadata_uuid in check_unfinished_fsid_change
In preparation to use check_unfinished_fsid_change() to support the ability to reunite devices after a failed 'btrfstune -m|M' command, rename %unused2 to %metadata_uuid as the function check_unfinished_fsid_change() write the metadata_uuid from the ctree to it. Signed-off-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
aff1f16deb
commit
fd3c4c4df1
@ -27,7 +27,7 @@
|
||||
int set_metadata_uuid(struct btrfs_root *root, const char *new_fsid_string)
|
||||
{
|
||||
struct btrfs_super_block *disk_super;
|
||||
uuid_t fsid, unused2;
|
||||
uuid_t fsid, metadata_uuid;
|
||||
struct btrfs_trans_handle *trans;
|
||||
bool new_fsid = true;
|
||||
u64 incompat_flags;
|
||||
@ -45,7 +45,7 @@ int set_metadata_uuid(struct btrfs_root *root, const char *new_fsid_string)
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (check_unfinished_fsid_change(root->fs_info, fsid, unused2)) {
|
||||
if (check_unfinished_fsid_change(root->fs_info, fsid, metadata_uuid)) {
|
||||
error("UUID rewrite in progress, cannot change metadata_uuid");
|
||||
return 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user