From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.burntcomma.com (mail2.burntcomma.com [217.169.27.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B043B29898B for ; Tue, 17 Feb 2026 18:54:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.169.27.34 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771354447; cv=none; b=jQ5xUqVaq4KWwBciwpI0OIksOWfYZxvEObNH4hQy5UerF8ePMbMA0PG+xp8+RrMZGz2cHHRCOW6pPT1NZHhVlV9Dp+CDdDo78L0SzJh/5tXCHkftSs4BB2Lm27vryrg3+FjFd6ln5p51MJK78LmG7nh+/eDWCKKrrjNbJwlM+Qg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771354447; c=relaxed/simple; bh=iAjVTptg1wSg4153Q86Ok/TalSlRKM5vCNqpsc3THcI=; h=From:To:Cc:Subject:Date:Message-ID:Mime-Version; b=tB1BWWUnS38Q4BmLKQs8cilU4dIiRvjeV5wqOlRFwYBHj/EehBnZ5enm3/V85rgH6L5ibxlXjtv3zP6Y0hXYEsFvifwBFuoykCFSrEEtnpyoo8d1dlWVCCMZfiQ2vbIyLZB9Xx2NSxq0e43Rd7KJyr/kxczumNd4VDjqs/4bmG4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=harmstone.com; spf=pass smtp.mailfrom=harmstone.com; dkim=pass (1024-bit key) header.d=harmstone.com header.i=@harmstone.com header.b=49UseQPj; arc=none smtp.client-ip=217.169.27.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=harmstone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=harmstone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=harmstone.com header.i=@harmstone.com header.b="49UseQPj" Received: from beren (beren.burntcomma.com [IPv6:2a02:8012:8cf0:0:ce28:aaff:fe0d:6db2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by mail.burntcomma.com (Postfix) with ESMTPSA id 14FCF303131; Tue, 17 Feb 2026 18:54:04 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=harmstone.com; s=mail; t=1771354444; bh=ckezU9CDSereNpkcYiqkt7lSN65/vIBUsJVAVK+vumQ=; h=From:To:Cc:Subject:Date; b=49UseQPjg30x0flRQVmIjIH/HjPsq0gjsQNtbJ//iQ4ku7AyYsdA6dHdb1nnZFU5M gU2U98BPB3VcTOesqNm5GxYRrrAzZMjnpXDLk+Ds5l0xh0sM62xmd4fHDrgt9BZLPJ YGBUxIbiG6rwMdVJ3cJpkhrjQJOOgcP0Fnsdiu88= From: Mark Harmstone To: linux-btrfs@vger.kernel.org, wqu@suse.com Cc: Mark Harmstone Subject: [PATCH] btrfs: fix error message in btrfs_validate_super() Date: Tue, 17 Feb 2026 18:53:19 +0000 Message-ID: <20260217185335.21013-1-mark@harmstone.com> Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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