From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=115.124.30.97 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793872182; b=BaWCcMMAoMGrenRE8HQS0HOAVYBYbxRGu/Q0uRdvcMbNrdKVNckImwYbwfFEbEBkGWlv /RQzvZ7YPYd5Ll2hVlAGpAQYfUU9epcnwFfV2S72MrPaDkAg6tqXEG41x0BdAocLgj247 vSzARCFPxW8LCfWdEjxK4Umgq2s8iEqKOof3Q18xPSLG99devQTkixypQ+tK2uqtaO2gG D/Fdz3xIeE1nF06375aojpojDRNMvCZv+XRx9RZp53wetAVzUbPOoHoozBbL3WzA2Z8Rv qeJ9L5RPQ4i+8xDnfYbF7czAA0gNJjCJIYkVDcpz2fODC9FgrT3H9tEiSWshABK7Eqw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793872182; 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=kCvgsly8FCsXc0g7/2zskbLWDNvOjLoguzel/K4aeGE=; b=CXqJhqwgb7tv5oJY9SQmv6AZ7liHEkmrHd7bkTRNnvYOlwVDGc14xPdbyiqzwNe3xr4v Cmg+cj/ksfdvWP0PEzXdViF6K4ivmyvMpGAP4szMSF4z4bj7a69QffnKenCDTS32AQ91P /cYPA4wuTfcnmr9GO0FwRJCI5y8pWySJAUsDsuWEguRxj1jw4fMdeuwPV7yErQFX3N5q0 MTVpQfkJBSR65IlBdpTLQm9M2N7cf4bITn5wZOqfXCcAFZkr5KY7daSdViZEqPIwFOUiZ 6TdeS6DFEU6LmPyuX1zryC7FOT0MWURf/AFLL4KVZfy3D7WEOaTRCj2nS6sAzMCMgeQ== 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=RoDFaRBy; arc=none smtp.remote-ip=115.124.30.97 Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) (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 E2F876082BC8 for ; Thu, 5 Nov 2026 09:49:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E2F876082BC8 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, unprotected) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.a=rsa-sha256 header.s=default header.b=RoDFaRBy DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1793872174; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=kCvgsly8FCsXc0g7/2zskbLWDNvOjLoguzel/K4aeGE=; b=RoDFaRBy6BxYoppdNolUhvNXCvRNIcdGoes2UPos2MCSzz1Q4o2aWtE08LOqNaTBRWEO+rKdIkmz5u43nlhCQSgxPT9s7vJ66nrUS2Amhy3RRrOmY6E3SmhG4yvG0Bpiu/pMuQFITVpiaGqBp65W1DFmlPxvgSNVDEmfnyBIH2U= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R201e4;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_---0XE8QR0g_1793872172; Received: from localhost(mailfrom:joseph.qi@linux.alibaba.com fp:SMTPD_---0XE8QR0g_1793872172 cluster:ay36) by smtp.aliyun-inc.com; Thu, 05 Nov 2026 17:49:33 +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 06/30] ocfs2: abstract the dinode suballoc bit check Date: Thu, 5 Nov 2026 17:49:02 +0800 Message-Id: <20261105094926.3203416-7-joseph.qi@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20261105094926.3203416-1-joseph.qi@linux.alibaba.com> References: <20261105094926.3203416-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 i_suballoc_bit against ocfs2_suballoc_bits_per_block() test into a predicate. The rationale comment stays at the call site, next to the error it explains. 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 412c8149d306..89970378daf4 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -101,6 +101,12 @@ static bool ocfs2_dinode_has_out_of_range_suballoc_slot(struct super_block *sb, (u32)le16_to_cpu(di->i_suballoc_slot) > OCFS2_SB(sb)->max_slots - 1; } +static bool ocfs2_dinode_has_bad_suballoc_bit(struct super_block *sb, + struct ocfs2_dinode *di) +{ + return le16_to_cpu(di->i_suballoc_bit) >= ocfs2_suballoc_bits_per_block(sb); +} + static bool ocfs2_valid_inode_mode(umode_t mode) { return fs_umode_to_ftype(mode) != FT_UNKNOWN; @@ -1590,7 +1596,7 @@ int ocfs2_validate_inode_block(struct super_block *sb, * BUG_ON((count + start_bit) > ocfs2_bits_per_group(cl)), since any * group holds at most ocfs2_suballoc_bits_per_block() bits. */ - if (le16_to_cpu(di->i_suballoc_bit) >= ocfs2_suballoc_bits_per_block(sb)) { + if (ocfs2_dinode_has_bad_suballoc_bit(sb, di)) { rc = ocfs2_error(sb, "Invalid dinode %llu: suballoc bit %u\n", (unsigned long long)bh->b_blocknr, le16_to_cpu(di->i_suballoc_bit)); -- 2.39.3