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=1793963720; b=i/H5zJigMks8tYBQa5Pe9I5xnQsuzxUhexeJHUjvgq7QWWv9Uf7d/K0vnp/9suOxwV/A zKgBk/VvZXKNqkOMQCOuH2p3PFJqKSWE21uDZfvvrgNIAnm9WoGfRGnwKpG8VKgZNqnBp yHElSJjm/AHI35hPb3hGFk1EKfdA0quYZIlR29JPbgPlqUc2TfLlM9Et92mQnkNYyxHZV jBa9sxsrdpevhrYY5j3SAHS20THekZ7y7OcG/qhhm+y4FMTn7suj7CsimCB0yOeFR2xhm v045KxBX5Xo1VVa15gNcTOqXmHALtTQuu4Tf51gW7roS2YzqZYvoWVhKZXnIFW8Exog== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793963720; 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=vsfdyaWyExPFfGu7+uGFOwgf+7DxEdrZIMMx+sL7n4w=; b=u5+WoCa2oSKPgMsCVZ1r3kUR07GE50VG/BVAVCD92IttswRVpLFQYqSclpmSkGb7Emob Bjy8jwAf7iDHGtXgHx7rVRi1TomeJLsTcaEZPV9W0XYxHpqRkISDCG6R9UT2720O2HhHN cwzpDRR8ThI8/dUygadhGlQFjImURaSK/2NU/XoHp44zF3rhrywFjUezezFES5Pze6CPV 0sSzJD2g/1BjfEJ6pOCGnhHnELURZpvbJIlzZag4CJoZ1YwnjAxzHCH+xmGktf3bh4fuq qdyVGK+2qbuN3pKiPO+NzEOK96W1WDOA4mrl/n/L3NRHKp5V5h3su7uHfOxSpAq0tsg== 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=xq4X6qbA; 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 71444608361C for ; Fri, 6 Nov 2026 11:15:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 71444608361C 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=xq4X6qbA DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1793963717; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=vsfdyaWyExPFfGu7+uGFOwgf+7DxEdrZIMMx+sL7n4w=; b=xq4X6qbA23JzVaBmEFhGiZP0+IA7sPcGnvLxp4gIgqe1hOzRZcARJXG3mHDqw9paS+3F95t+w32kHtAnVQDluazDEuF+IZV+IoRR0qCFGNbewAdz1Jt/F0Dg60lLSIYNxoa1FvzhrJUo6TeGSMIUk7ElpIOpXmj5XKffVBoOYRo= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R621e4;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_---0XEBf736_1793963716; Received: from localhost(mailfrom:joseph.qi@linux.alibaba.com fp:SMTPD_---0XEBf736_1793963716 cluster:ay36) by smtp.aliyun-inc.com; Fri, 06 Nov 2026 19:15:16 +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 v2 19/31] ocfs2: abstract the zero extent list count check Date: Fri, 6 Nov 2026 19:14:46 +0800 Message-Id: <20261106111458.1467464-20-joseph.qi@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20261106111458.1467464-1-joseph.qi@linux.alibaba.com> References: <20261106111458.1467464-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 l_count == 0 test into a predicate, the first of the extent list group guarded by ocfs2_dinode_has_extents(). No functional change intended. Signed-off-by: Joseph Qi --- fs/ocfs2/inode.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index 501a11d2b071..551263f290bf 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -260,6 +260,11 @@ static bool ocfs2_dinode_has_refcount_without_loc(struct ocfs2_dinode *di) !di->i_refcount_loc; } +static bool ocfs2_dinode_has_zero_extent_count(struct ocfs2_dinode *di) +{ + return le16_to_cpu(di->id2.i_list.l_count) == 0; +} + void ocfs2_set_inode_flags(struct inode *inode) { unsigned int flags = OCFS2_I(inode)->ip_attr; @@ -1908,7 +1913,7 @@ int ocfs2_validate_inode_block(struct super_block *sb, u16 count = le16_to_cpu(el->l_count); u16 next_free = le16_to_cpu(el->l_next_free_rec); - if (count == 0) { + if (ocfs2_dinode_has_zero_extent_count(di)) { rc = ocfs2_error(sb, "Invalid dinode %llu: extent list l_count is zero\n", (unsigned long long)bh->b_blocknr); -- 2.39.3