[PATCH] btrfs: fix error message in btrfs_validate_super()

[PATCH] btrfs: fix error message in btrfs_validate_super()

[Mark Harmstone]

Fix the superblock offset mismatch error message in
btrfs_validate_super(): we changed it so that it considers all the
superblocks, but the message still assumes we're only looking at the
first one.

The change from %u to %llu is because we're changing from a constant to
a u64.

Signed-off-by: Mark Harmstone <mark@harmstone.com>
Fixes: 069ec957c35e ("btrfs: Refactor btrfs_check_super_valid")
---
 fs/btrfs/disk-io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 600287ac8eb7..f39008591631 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2533,8 +2533,8 @@ int btrfs_validate_super(const struct btrfs_fs_info *fs_info,
 
 	if (unlikely(mirror_num >= 0 &&
 		     btrfs_super_bytenr(sb) != btrfs_sb_offset(mirror_num))) {
-		btrfs_err(fs_info, "super offset mismatch %llu != %u",
-			  btrfs_super_bytenr(sb), BTRFS_SUPER_INFO_OFFSET);
+		btrfs_err(fs_info, "super offset mismatch %llu != %llu",
+			  btrfs_super_bytenr(sb), btrfs_sb_offset(mirror_num));
 		ret = -EINVAL;
 	}
 
-- 
2.52.0

Re: [PATCH] btrfs: fix error message in btrfs_validate_super()

[Qu Wenruo]

在 2026/2/18 05:23, Mark Harmstone 写道:
> Fix the superblock offset mismatch error message in
> btrfs_validate_super(): we changed it so that it considers all the
> superblocks, but the message still assumes we're only looking at the
> first one.
> 
> The change from %u to %llu is because we're changing from a constant to
> a u64.
> 
> Signed-off-by: Mark Harmstone <mark@harmstone.com>
> Fixes: 069ec957c35e ("btrfs: Refactor btrfs_check_super_valid")

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

Thanks,
Qu

> ---
>   fs/btrfs/disk-io.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index 600287ac8eb7..f39008591631 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -2533,8 +2533,8 @@ int btrfs_validate_super(const struct btrfs_fs_info *fs_info,
>   
>   	if (unlikely(mirror_num >= 0 &&
>   		     btrfs_super_bytenr(sb) != btrfs_sb_offset(mirror_num))) {
> -		btrfs_err(fs_info, "super offset mismatch %llu != %u",
> -			  btrfs_super_bytenr(sb), BTRFS_SUPER_INFO_OFFSET);
> +		btrfs_err(fs_info, "super offset mismatch %llu != %llu",
> +			  btrfs_super_bytenr(sb), btrfs_sb_offset(mirror_num));
>   		ret = -EINVAL;
>   	}
>   

Re: [PATCH] btrfs: fix error message in btrfs_validate_super()

[David Sterba]

On Tue, Feb 17, 2026 at 06:53:19PM +0000, Mark Harmstone wrote:
> Fix the superblock offset mismatch error message in
> btrfs_validate_super(): we changed it so that it considers all the
> superblocks, but the message still assumes we're only looking at the
> first one.
> 
> The change from %u to %llu is because we're changing from a constant to
> a u64.
> 
> Signed-off-by: Mark Harmstone <mark@harmstone.com>
> Fixes: 069ec957c35e ("btrfs: Refactor btrfs_check_super_valid")

FYI I've edited the subjects of the error message fixing patches to be
more specific what is being fixed now that there are a few of them.