btrfs: fix warning in scrub_verify_one_metadata()

maharmstone · kdave · commit 44e2fda66427 · 2026-02-26T15:03:28.000+01:00
Commit b471965 ("btrfs: fix replace/scrub failure with metadata_uuid") fixed the comparison in scrub_verify_one_metadata() to use metadata_uuid rather than fsid, but left the warning as it was. Fix it so it matches what we're doing. Fixes: b471965 ("btrfs: fix replace/scrub failure with metadata_uuid") Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: Mark Harmstone <mark@harmstone.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
@@ -744,7 +744,7 @@ static void scrub_verify_one_metadata(struct scrub_stripe *stripe, int sector_nr
 		btrfs_warn_rl(fs_info,
 	      "scrub: tree block %llu mirror %u has bad fsid, has %pU want %pU",
 			      logical, stripe->mirror_num,
-			      header->fsid, fs_info->fs_devices->fsid);
+			      header->fsid, fs_info->fs_devices->metadata_uuid);
 		return;
 	}
 	if (memcmp(header->chunk_tree_uuid, fs_info->chunk_tree_uuid,

Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,7 @@ static void scrub_verify_one_metadata(struct scrub_stripe *stripe, int sector_nr`
`744`	`744`	`btrfs_warn_rl(fs_info,`
`745`	`745`	`"scrub: tree block %llu mirror %u has bad fsid, has %pU want %pU",`
`746`	`746`	`logical, stripe->mirror_num,`
`747`		`- header->fsid, fs_info->fs_devices->fsid);`
	`747`	`+ header->fsid, fs_info->fs_devices->metadata_uuid);`
`748`	`748`	`return;`
`749`	`749`	`}`
`750`	`750`	`if (memcmp(header->chunk_tree_uuid, fs_info->chunk_tree_uuid,`