From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794257588; b=zOGu1hn+Jf38MC6+oDfBhuCKyz7cjymjwmLPDWF467o0jUSNlErWCdL8hQjEosLGMjT6 Tat6RlrncgSxqZuMmnjloAY01J+PZtC84LSWC83dnX8ZxTDdD4IIo0/yosGmHm7786WnL 3zaQWjOGownnGHzrgZlKaSQMmwi129W32crjhvbXj13TOIEWG41Y75yeYg5XP9izwRi+F LmpAQYpgXBGzoQIlmspG/FfyFt/pDwsKf26hlf2IEwdi9vdZVaGzJ+dBmyPdxAkA4iG1b D1KGaZJevoXMElpbtB3H6232z96B/bME4mUNo7d53GtM/RSds3jugUSWI+jqEKkeN7A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794257588; h=Received:DKIM-Signature:Date:To:From:Subject:Message-Id; bh=6xSZyJqfmr9qcq9xMKGfnf0uIWKvjSgQUm3lGE9whEg=; b=xBTl8Dczzz7YPqEUKkV5qPfK7Mn9tMwf34L175mrPyGXyrMYCgLyDkI31Wi3cqv4pBBs u5tjXFtUFet77yqQB84FHmQFjsGVU8qjiR58omXB2JcFaz5Ef6QFEe7Q7CImDsFXDVZX0 76ztGjUW9CJH2UkRX/HnTzSzsS/8rOneKWD47mnU5iAoIhjnYFpIminJ0kPWoeo8cZH0z JcUO16PEYCRwsT0aSWaWm0EitLz/Gv2Dg1Jue4nwWU3ILWiKEDnonk0IdGwV4eyrfOkAo CcT9ila/ybI7sXA/kSNOlWVeg5mN7EV0tATFw3sxVizOSlqBhGB9kX5dRfiiGWc5DKA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linux-foundation.org header.i=@linux-foundation.org header.a=rsa-sha256 header.s=korg header.b=rqUTGfgG; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5531B606A31C for ; Mon, 9 Nov 2026 20:53:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.a=rsa-sha256 header.s=korg header.b=rqUTGfgG Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA5A81F0089F; Mon, 9 Nov 2026 20:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1794257588; bh=6xSZyJqfmr9qcq9xMKGfnf0uIWKvjSgQUm3lGE9whEg=; h=Date:To:From:Subject; b=rqUTGfgG8e83e2QdrqilGKhSx51C90oPzfEbG978j297wjPClB4biIQ9LW+fZTm6z Cp797Sk7KbZ8OjtTHd+bT+2srHbyTho0Ld+vLHc3m6pvYLgCQqyZFuVdN7j/UWcakb lTbER0K0s2dGhqWP4TQh7/xULgy15BcOs/iAvhFw= Date: Mon, 09 Nov 2026 12:53:07 -0800 To: mm-commits@vger.kernel.org,joseph.qi@linux.alibaba.com, akpm@linux-foundation.org From: Andrew Morton Subject: + ocfs2-abstract-the-chain-list-dinode-guard-and-count-check.patch added to mm-nonmm-unstable branch Message-Id: <20261109205307.DA5A81F0089F@smtp.kernel.org> X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list The patch titled Subject: ocfs2: abstract the chain list dinode guard and count check has been added to the -mm mm-nonmm-unstable branch. Its filename is ocfs2-abstract-the-chain-list-dinode-guard-and-count-check.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/ocfs2-abstract-the-chain-list-dinode-guard-and-count-check.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via various branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there most days ------------------------------------------------------ From: Joseph Qi Subject: ocfs2: abstract the chain list dinode guard and count check Date: Mon, 09 Nov 2026 20:21:05 +0800 Introduce ocfs2_dinode_has_chain_list() for the OCFS2_CHAIN_FL test that selects the id2.i_chain union arm, and ocfs2_dinode_has_bad_chain_count() for the cl_count against ocfs2_chain_recs_per_inode() test. This mirrors the guard predicates already used for the inline-data and fast symlink groups, and ocfs2_dinode_has_extents() for the extent list group. No functional change intended. Link: https://lore.kernel.org/20261109122121.21473-16-joseph.qi@linux.alibaba.com Signed-off-by: Joseph Qi Signed-off-by: Andrew Morton Cc: Heming Zhao Cc: Mark Fasheh Cc: Joel Becker --- fs/ocfs2/inode.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) --- a/fs/ocfs2/inode.c~ocfs2-abstract-the-chain-list-dinode-guard-and-count-check +++ a/fs/ocfs2/inode.c @@ -226,6 +226,18 @@ static bool ocfs2_dinode_has_unterminate return strnlen((char *)di->id2.i_symlink, i_size + 1) != i_size; } +static bool ocfs2_dinode_has_chain_list(struct ocfs2_dinode *di) +{ + return le32_to_cpu(di->i_flags) & OCFS2_CHAIN_FL; +} + +static bool ocfs2_dinode_has_bad_chain_count(struct super_block *sb, + struct ocfs2_dinode *di) +{ + return le16_to_cpu(di->id2.i_chain.cl_count) != + ocfs2_chain_recs_per_inode(sb); +} + void ocfs2_set_inode_flags(struct inode *inode) { unsigned int flags = OCFS2_I(inode)->ip_attr; @@ -1840,12 +1852,12 @@ int ocfs2_validate_inode_block(struct su } } - if (le32_to_cpu(di->i_flags) & OCFS2_CHAIN_FL) { + 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 (le16_to_cpu(cl->cl_count) != ocfs2_chain_recs_per_inode(sb)) { + if (ocfs2_dinode_has_bad_chain_count(sb, di)) { rc = ocfs2_error(sb, "Invalid dinode %llu: chain list count %u\n", (unsigned long long)bh->b_blocknr, le16_to_cpu(cl->cl_count)); _ Patches currently in -mm which might be from joseph.qi@linux.alibaba.com are ocfs2-exempt-orphaned-dinodes-from-the-zero-nlink-check.patch ocfs2-abstract-the-zero-nlink-or-mode-dinode-check.patch ocfs2-abstract-the-dinode-i_blkno-mismatch-check.patch ocfs2-abstract-the-dinode-ocfs2_valid_fl-check.patch ocfs2-abstract-the-dinode-fs_generation-mismatch-check.patch ocfs2-abstract-the-dinode-suballoc-slot-checks.patch ocfs2-abstract-the-dinode-suballoc-bit-check.patch ocfs2-abstract-the-dinode-orphaned-slot-check.patch ocfs2-abstract-the-dinode-dio-orphaned-slot-check.patch ocfs2-abstract-the-inline-data-dinode-guard-and-cluster-check.patch ocfs2-abstract-the-inline-data-id_count-bound-check.patch ocfs2-abstract-the-inline-data-i_size-bound-check.patch ocfs2-abstract-the-fast-symlink-dinode-guard-and-size-check.patch ocfs2-abstract-the-fast-symlink-nul-termination-check.patch ocfs2-abstract-the-chain-list-dinode-guard-and-count-check.patch ocfs2-abstract-the-chain-list-next-free-record-check.patch ocfs2-abstract-the-chain-list-bits-per-cluster-check.patch ocfs2-abstract-the-dinode-refcount-location-check.patch ocfs2-abstract-the-zero-extent-list-count-check.patch ocfs2-abstract-the-oversized-extent-list-count-check.patch ocfs2-abstract-the-extent-list-next-free-record-check.patch ocfs2-report-unrepairable-corruption-from-online-filecheck-fix.patch ocfs2-check-dinode-nlink-and-mode-in-online-filecheck.patch ocfs2-check-dinode-suballoc-slot-in-online-filecheck.patch ocfs2-check-dinode-suballoc-bit-in-online-filecheck.patch ocfs2-check-dinode-orphaned-slots-in-online-filecheck.patch ocfs2-check-inline-data-dinodes-in-online-filecheck.patch ocfs2-check-fast-symlink-dinodes-in-online-filecheck.patch ocfs2-check-chain-list-dinodes-in-online-filecheck.patch ocfs2-check-dinode-refcount-location-in-online-filecheck.patch ocfs2-check-extent-list-dinodes-in-online-filecheck.patch