diff mbox series

[1/5] btrfs-progs: cleanup duplicate check metadata_uuid flag

Message ID cd4366f46e9ffef7538ec385587d5fe2d0743038.1692963810.git.anand.jain@oracle.com (mailing list archive)
State New, archived
Headers show
Series btrfs-progs: recover from failed metadata_uuid port kernel | expand

Commit Message

Anand Jain Aug. 25, 2023, 2:47 p.m. UTC 
The active_metadata_uuid already holds the value of the metadata_uuid
flag. Remove the check for the same flag from the super_copy, which
below patch forgot.

     btrfs-progs: Track active metadata_uuid per fs_devices

This patch should be rolled into it.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 tune/main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

David Sterba Aug. 28, 2023, 3:28 p.m. UTC | #1 
On Fri, Aug 25, 2023 at 10:47:47PM +0800, Anand Jain wrote:
> The active_metadata_uuid already holds the value of the metadata_uuid
> flag. Remove the check for the same flag from the super_copy, which
> below patch forgot.
> 
>      btrfs-progs: Track active metadata_uuid per fs_devices
> 
> This patch should be rolled into it.

Folded to the patch, thanks.

> Signed-off-by: Anand Jain <anand.jain@oracle.com>
diff mbox series

Patch

diff --git a/tune/main.c b/tune/main.c
index e3b199c10dad..d344cdad06e1 100644
--- a/tune/main.c
+++ b/tune/main.c
@@ -426,8 +426,7 @@  int BOX_MAIN(btrfstune)(int argc, char *argv[])
 	}
 
 	if (random_fsid || (new_fsid_str && !change_metadata_uuid)) {
-		if (btrfs_fs_incompat(fs_info, METADATA_UUID) ||
-		    fs_info->fs_devices->active_metadata_uuid) {
+		if (fs_info->fs_devices->active_metadata_uuid) {
 			error(
 		"Cannot rewrite fsid while METADATA_UUID flag is active. \n"
 		"Ensure fsid and metadata_uuid match before retrying.");