From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=115.124.30.101 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794226919; b=IU/4EIZoWl6/p1hLHJDLI72URSrMUlRvBcnGVOdbgh7f/rKw17mT13ttRiVw7AhPpWBh W766ChN4Dhu1/Ryx1Lii+/spsL6/xEGdtyiJbp3BtOvF0GkOPTsn0xn9XWqEirAR+KSUM ZVPOUD2gt+Q+640CUsT/dlJjveFSJkDQGTOnOtmwuIIoPGqaFgl6dwN01Mhn/RJF54tIH 970M3QU0GJV8a6N+eeXQJWMKaSA/V7FJJIDQ4k0gaNaX2Lyqskm6W0mhpG1TZR4FwmL4f 8b5Ja7f3PzodnjiDPVdAC1Pg41hO7osZssLsBrkiL+UKkstzIUwt2hUzNjUU9dygGlg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794226919; 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=iQ725nX9UdgX+EvgHWCaaetNVZXMZujjh3zhcuCl3JA=; b=QHY64MbTfzGfWb8nrrilcKFsQzLCgHtBzFS1Fm7s3EUKR9ERn0A+1A0joqaZQnRXT8fz vvT9727eDWkuhE8aZNuwxyHDnJbRrmP5B21nhdQMpAAg+Iou2mHWh2c9sU2xQtZW8pxa6 laFME/Z9FwfXI1kcYDkw7mSoir8LOp19i1uKtWUfutkFP7G2H1EVyaE82T5CDq0h+r3vW f71kgtRX6qP8BwgSYHFpwggDT4Eme3MAngeIeCCNpUglpWBb6Diqrz5bF22AysWrm0ARY b/fULdVaQVkG304z7jugR6I97LGM9pYLGGT8gLEkpw7mgMshXpF14SbuKeeSMBE9qRA== 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=gPde83q7; arc=none smtp.remote-ip=115.124.30.101 Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) (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 51DEE606A339 for ; Mon, 9 Nov 2026 12:21:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 51DEE606A339 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=gPde83q7 DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1794226914; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=iQ725nX9UdgX+EvgHWCaaetNVZXMZujjh3zhcuCl3JA=; b=gPde83q7R8zhBZAiwmihM5B67w6nlOszlEKQTjDVhgnltONFgF9UIh+xAwCxhhK6GfNQQU8xySmnj/nVMqPeyzhRn8LKwJtTbHja/a8iSINLpeTw/X32yXQANHNYV/WaArTRS05y9icNUXPNV0Moy1Y9FkIMVjZnsptS//6n5Cg= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R451e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam011083073210;MF=joseph.qi@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0XEOjdoY_1794226913; Received: from localhost(mailfrom:joseph.qi@linux.alibaba.com fp:SMTPD_---0XEOjdoY_1794226913 cluster:ay36) by smtp.aliyun-inc.com; Mon, 09 Nov 2026 20:21:54 +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 07/31] ocfs2: abstract the dinode suballoc bit check Date: Mon, 9 Nov 2026 20:20:57 +0800 Message-Id: <20261109122121.21473-8-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 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 0929deb3e4b4..3be98328925d 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -111,6 +111,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; @@ -1601,7 +1607,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