tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

btrfs: fix warning in scrub_verify_one_metadata()

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>

authored by

Mark Harmstone and committed by
David Sterba 44e2fda6 a1017278

+1 -1
+1 -1
fs/btrfs/scrub.c
··· 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,