]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
btrfs: fix warning in scrub_verify_one_metadata()
authorMark Harmstone <mark@harmstone.com>
Tue, 17 Feb 2026 17:46:13 +0000 (17:46 +0000)
committerDavid Sterba <dsterba@suse.com>
Thu, 26 Feb 2026 14:03:28 +0000 (15:03 +0100)
Commit b471965fdb2d ("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: b471965fdb2d ("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>
fs/btrfs/scrub.c

index 2a64e2d50ced972e4a195e3b2fe657084860cd27..052d83feea9ae72e34a66b50d387e547e680a9d2 100644 (file)
@@ -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,