From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F296D3E316C; Tue, 31 Mar 2026 16:30:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774974657; cv=none; b=YdcK2aBVrLDaG3bNr170sd7c9w69gMyPyQOjU8g/drLdnQydRNv/HdPDmXiAF4eJHfcfwLJGKP5R1eQ+nn19GQT8rEC/eeyNnj0YifFRdPZKKjGAh1RYtEEDvkQM9i6O4M4MFARuQQW4iFLALZnq3baFXzZkgfco+giiHViaUTI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774974657; c=relaxed/simple; bh=q780jW0UHNzqKsHNH/8VvOrs9Vddq63i+aNQooGSldQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rpk+sEMfmhJb48+KvGsf1wJsNWRrBRHLPBpzIVZh/dzpZzLmBvCd63UbUV+JbVVDYZeIvPM+HXXszWSwHSQpR8NQpXE7qioKI/XLAWV87yzLE4pbBjXBC+ioqd8O+HN3YAYs1igGeZSHGvxjYPOrOm0JBoY1vQPDL4HeFDS3+xk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rZNz89l7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="rZNz89l7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88EAFC19424; Tue, 31 Mar 2026 16:30:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774974656; bh=q780jW0UHNzqKsHNH/8VvOrs9Vddq63i+aNQooGSldQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rZNz89l72xzYDqt6mzoX44oghbant+Z9s5Le4gow7UpYCi4M23JJ2d4BxQyQpsj/l 23TE1snlIYpDa/cWndHugGDr9lfGvGy97w1j6Kl7qZtoK93OHWRpFJQNAKg4PwMq2S Dlr2mRDQ0TxDZDd3sJUpIfKzmvutpMo6pOASnr4g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qu Wenruo , Mark Harmstone , David Sterba , Sasha Levin Subject: [PATCH 6.6 169/175] btrfs: fix super block offset in error message in btrfs_validate_super() Date: Tue, 31 Mar 2026 18:22:33 +0200 Message-ID: <20260331161736.004622743@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331161729.779738837@linuxfoundation.org> References: <20260331161729.779738837@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mark Harmstone [ Upstream commit b52fe51f724385b3ed81e37e510a4a33107e8161 ] 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. Fixes: 069ec957c35e ("btrfs: Refactor btrfs_check_super_valid") Reviewed-by: Qu Wenruo Signed-off-by: Mark Harmstone Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- 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 b4ec844b7d741..c7746baa86f8c 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2444,8 +2444,8 @@ int btrfs_validate_super(struct btrfs_fs_info *fs_info, if (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.53.0