From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=115.124.30.119 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794226932; b=Xl76zs8wMKx8a8W4YhRzfgH4FguH6aI2Rg/J5Sz+WxNYQY+XfKWz8G7+5KQ+Gw1HSvq2 v59GtDQnbwHDgGy7AVM+Ex1/mJkvcVn2hpfKIJql0t1bAmgBUw//sQZ8PNZJB1WrpJd5H Md4jNi8SOsCz0RQFS+v9EvzQw5ilChJPBXduSrDrvIr3S9dJxbxeQboemWTCBbetVs0gO 1KRVy1ophyuo7TxftyXyF/sN34mxrkohbVMD2AfKjrdzSRGv6fhptXg1r7QGwP8aNl2Yq PfzD4kOfZIL1ng8DnpD5oeTcGxBQqnx9EB7hEo9LYrpARVeC7sGKGqn1pD6fn8EgrMA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794226932; h=DMARC-Filter:DKIM-Signature:X-Alimail-AntiSpam:Received:From:To:Cc: Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=v2LSCJtn6vzEarQFue48CenoRyzB1aR39rmzqttV9kg=; b=m8BRuo/+gkMECFhFbY4bNwpDtPlqdVlU6hnwz7LLLfeFbVQLFJIEHM3M4S+57XKFPwzC JrD577UpuiqeJ/gLH4isD72cDty7c3si7ELVLTzpHYDMqOxi1MzyVc0Xy9vsl+5kFsHT/ zA4Lxj9AZerePByzLGcjV1MvdyDyfr/1DHHlYF6+sDsuIrke7IDHlz5wi559tGPeGyvmp LDIc2LAou28BBLZJyRy7/fElAESwcVZ/DnlHmUuSjLYPAC/N9BnsrVHl6w9/T1Oih5Bh0 5hld3aJw8EoJtfuV+XD6jeVd2RjaUuS4cxwbWgnRGSns6vgBlYMpda119HsJjcFpRfw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass header.d=linux.alibaba.com header.i=@linux.alibaba.com header.a=rsa-sha256 header.s=default header.b=HTT9opoR; arc=none smtp.remote-ip=115.124.30.119 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C13E16082BD5 for ; Mon, 9 Nov 2026 12:22:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C13E16082BD5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.a=rsa-sha256 header.s=default header.b=HTT9opoR DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1794226924; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=v2LSCJtn6vzEarQFue48CenoRyzB1aR39rmzqttV9kg=; b=HTT9opoRKmxN54HWUajzRdUHy3oU33LcFYPfYTs+j0dm1mSaNLab+1PD7VKb7I6EZ2K/d737eF0LYbM1d15/0yAz2rfe3Pq55+kmBXI8fejGl2Lfz5ctc/CQ9mKbFWUnZnAN6HS3yLlWjcneMvjuXp/9v0giFWCTc46KNx93LPo= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R761e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045133197;MF=joseph.qi@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0XEOZNkq_1794226923; Received: from localhost(mailfrom:joseph.qi@linux.alibaba.com fp:SMTPD_---0XEOZNkq_1794226923 cluster:ay36) by smtp.aliyun-inc.com; Mon, 09 Nov 2026 20:22:03 +0800 From: Joseph Qi To: Andrew Morton , Heming Zhao Cc: Mark Fasheh , Joel Becker , ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org, Joseph Qi Subject: [PATCH v3 17/31] ocfs2: abstract the chain list bits per cluster check Date: Mon, 9 Nov 2026 20:21:07 +0800 Message-Id: <20261109122121.21473-18-joseph.qi@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20261109122121.21473-1-joseph.qi@linux.alibaba.com> References: <20261109122121.21473-1-joseph.qi@linux.alibaba.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Fold the cl_bpc test into a predicate that computes the expected bits per cluster itself, and drop the u16 bpc local from ocfs2_validate_inode_block(). No log message prints it, so keeping it at the call site would leave an unused variable. The two bitmap_blkno conditions are preserved: the global bitmap inode itself is exempt from the bits-per-cluster check. No functional change intended. Signed-off-by: Joseph Qi --- fs/ocfs2/inode.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 0ad86aaa9ab3..34129e25a6ac 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -244,6 +244,16 @@ static bool ocfs2_dinode_has_bad_chain_next_free(struct ocfs2_dinode *di) le16_to_cpu(di->id2.i_chain.cl_count); } +static bool ocfs2_dinode_has_bad_chain_bpc(struct super_block *sb, + struct ocfs2_dinode *di) +{ + u16 bpc = 1 << (OCFS2_SB(sb)->s_clustersize_bits - sb->s_blocksize_bits); + + return OCFS2_SB(sb)->bitmap_blkno && + OCFS2_SB(sb)->bitmap_blkno != le64_to_cpu(di->i_blkno) && + le16_to_cpu(di->id2.i_chain.cl_bpc) != bpc; +} + void ocfs2_set_inode_flags(struct inode *inode) { unsigned int flags = OCFS2_I(inode)->ip_attr; @@ -1860,8 +1870,6 @@ int ocfs2_validate_inode_block(struct super_block *sb, if (ocfs2_dinode_has_chain_list(di)) { struct ocfs2_chain_list *cl = &di->id2.i_chain; - u16 bpc = 1 << (OCFS2_SB(sb)->s_clustersize_bits - - sb->s_blocksize_bits); if (ocfs2_dinode_has_bad_chain_count(sb, di)) { rc = ocfs2_error(sb, "Invalid dinode %llu: chain list count %u\n", @@ -1875,9 +1883,7 @@ int ocfs2_validate_inode_block(struct super_block *sb, le16_to_cpu(cl->cl_next_free_rec)); goto bail; } - if (OCFS2_SB(sb)->bitmap_blkno && - OCFS2_SB(sb)->bitmap_blkno != le64_to_cpu(di->i_blkno) && - le16_to_cpu(cl->cl_bpc) != bpc) { + if (ocfs2_dinode_has_bad_chain_bpc(sb, di)) { rc = ocfs2_error(sb, "Invalid dinode %llu: bits per cluster %u\n", (unsigned long long)bh->b_blocknr, le16_to_cpu(cl->cl_bpc)); -- 2.39.3