From fd3c4c4df1b6d2ad6236c97e66f703cc84738b14 Mon Sep 17 00:00:00 2001 From: Anand Jain Date: Mon, 14 Aug 2023 23:28:04 +0800 Subject: [PATCH] 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 Signed-off-by: David Sterba --- tune/change-metadata-uuid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tune/change-metadata-uuid.c b/tune/change-metadata-uuid.c index a49adda8..b161f675 100644 --- a/tune/change-metadata-uuid.c +++ b/tune/change-metadata-uuid.c @@ -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; }