From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=115.124.30.110 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794226936; b=xLFWdZ38UkDlnWR2XIK60IJuvlP9l/B/SKTix0ndorfTLwnkqB4nfgEv3A0xi8jPVUEz 3M3IXnzRexOfxwNO8EYxMF557+o7LNevB17M2enqptKj35ZZLY64rPZpxa41AAwpEUTxp rtuOoMaYe+dKUWqifvXJLTw6YCtK7wTFhZwSfhqDUCMxnl4pkrz19aHHBmu/hkzbNsnpI +ZmeoNcH9tirceWJE+QbqFRsDitFg59mLU2p8crgUQsuWkSvE4jy0kHrQQ3poVgd+3VuF wYeYx0zv8Gpcag/zQwJnRngFcQ0cpK5nQbQEgoQzVzAVoQhf+9Ofk39dH1gkFLdcEXA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794226936; 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=KWODd5koLgvTh8Hk6ZficFCm6r0AUkm1kFgtpaqzk7g=; b=DVyu+mF1c4D0JOFBjZd/UiG/C1ohXA401gaAcfYvksORoXzJM4j6pj4gAqY4Sr/bjUj+ oaojrtB5FRbUE3fJu9xkogrwFuH38JM1nn62MC0LruJ4ljIL09A9QWSisrHhj4seHpXV0 1aoshWY0eFuhddonA0CCnXv5+k3patYrxr05HKc1fCYy/Wyf4i3BqNaYoHAxw6UU1HROr fY4MuD2R3bEVBVJgJRQ8qP2sPA8X/PsYOF0PSsxOAqwhBsOjxNY3ka3gpqV2vXVEQ7UNF tQAjtXeK57xVEqtlVVqUXbVcw09+PLhlFHCVfPtdXRAfgpT8OkKQX+tbaeyZMmeKoHQ== 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=SY9Qbkfj; arc=none smtp.remote-ip=115.124.30.110 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) (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 C7AA8606D83B for ; Mon, 9 Nov 2026 12:22:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C7AA8606D83B 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=SY9Qbkfj DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1794226923; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=KWODd5koLgvTh8Hk6ZficFCm6r0AUkm1kFgtpaqzk7g=; b=SY9QbkfjWQLHQK3ICWX0zXgKaTR7PFRvfuG41POoG0alAgKgOcfGZg5W6mm7VCoRslx1gYBSGQNeBfl8fNUgO+2qf+46QKtayu2h9QTGnbrt7XnXzcAREhOQiKe0UHbPTG093n1bbBg1yJmEh7CK5d0QDlKs5cMYNfmP9Y6BVDQ= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R701e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037009110;MF=joseph.qi@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0XEP8at-_1794226922; Received: from localhost(mailfrom:joseph.qi@linux.alibaba.com fp:SMTPD_---0XEP8at-_1794226922 cluster:ay36) by smtp.aliyun-inc.com; Mon, 09 Nov 2026 20:22:02 +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 16/31] ocfs2: abstract the chain list next free record check Date: Mon, 9 Nov 2026 20:21:06 +0800 Message-Id: <20261109122121.21473-17-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_next_free_rec against cl_count test into a predicate. ocfs2_claim_suballoc_bits() in suballoc.c open-codes a similar test that also rejects cl_next_free_rec == 0. It is left alone because this predicate is not equivalent to it. No functional change intended. Signed-off-by: Joseph Qi --- fs/ocfs2/inode.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 71aded2c88f7..0ad86aaa9ab3 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -238,6 +238,12 @@ static bool ocfs2_dinode_has_bad_chain_count(struct super_block *sb, ocfs2_chain_recs_per_inode(sb); } +static bool ocfs2_dinode_has_bad_chain_next_free(struct ocfs2_dinode *di) +{ + return le16_to_cpu(di->id2.i_chain.cl_next_free_rec) > + le16_to_cpu(di->id2.i_chain.cl_count); +} + void ocfs2_set_inode_flags(struct inode *inode) { unsigned int flags = OCFS2_I(inode)->ip_attr; @@ -1863,7 +1869,7 @@ int ocfs2_validate_inode_block(struct super_block *sb, le16_to_cpu(cl->cl_count)); goto bail; } - if (le16_to_cpu(cl->cl_next_free_rec) > le16_to_cpu(cl->cl_count)) { + if (ocfs2_dinode_has_bad_chain_next_free(di)) { rc = ocfs2_error(sb, "Invalid dinode %llu: chain list index %u\n", (unsigned long long)bh->b_blocknr, le16_to_cpu(cl->cl_next_free_rec)); -- 2.39.3