public inbox for linux-btrfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] btrfs: fix warning in scrub_verify_one_metadata()
@ 2026-02-17 19:02 Mark Harmstone
  2026-02-17 21:12 ` Qu Wenruo
  0 siblings, 1 reply; 2+ messages in thread
From: Mark Harmstone @ 2026-02-17 19:02 UTC (permalink / raw)
  To: linux-btrfs, anand.jain; +Cc: Mark Harmstone

Commit b471965f 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.

Signed-off-by: Mark Harmstone <mark@harmstone.com>
Fixes: b471965fdb2d ("btrfs: fix replace/scrub failure with metadata_uuid")
---
 fs/btrfs/scrub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 2a64e2d50ced..052d83feea9a 100644
--- 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,
-- 
2.52.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] btrfs: fix warning in scrub_verify_one_metadata()
  2026-02-17 19:02 [PATCH] btrfs: fix warning in scrub_verify_one_metadata() Mark Harmstone
@ 2026-02-17 21:12 ` Qu Wenruo
  0 siblings, 0 replies; 2+ messages in thread
From: Qu Wenruo @ 2026-02-17 21:12 UTC (permalink / raw)
  To: Mark Harmstone, linux-btrfs, anand.jain



在 2026/2/18 05:32, Mark Harmstone 写道:
> Commit b471965f 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.
> 
> Signed-off-by: Mark Harmstone <mark@harmstone.com>
> Fixes: b471965fdb2d ("btrfs: fix replace/scrub failure with metadata_uuid")

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu

> ---
>   fs/btrfs/scrub.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
> index 2a64e2d50ced..052d83feea9a 100644
> --- 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,


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-02-17 21:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-17 19:02 [PATCH] btrfs: fix warning in scrub_verify_one_metadata() Mark Harmstone
2026-02-17 21:12 ` Qu Wenruo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox