[merged mm-nonmm-stable] ocfs2-do-not-use-make_bad_inode-in-ocfs2_read_inode_block_full.patch removed from -mm tree
Andrew Morton <[email protected]> Mon, 03 Aug 2026 21:05:20 -0700
| Newsgroups | org.kernel.vger.mm-commits |
|---|---|
| Message-ID | <[email protected]> |
The quilt patch titled
Subject: ocfs2: do not use make_bad_inode() in ocfs2_read_inode_block_full()
has been removed from the -mm tree. Its filename was
ocfs2-do-not-use-make_bad_inode-in-ocfs2_read_inode_block_full.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Dmitry Antipov <[email protected]>
Subject: ocfs2: do not use make_bad_inode() in ocfs2_read_inode_block_full()
Date: Thu, 9 Jul 2026 09:01:01 +0300
This reverts commit 58b6fcd2ab34 ("ocfs2: mark inode bad upon validation
failure during read").
Since 'make_bad_inode()' resets inode type to S_IFREG, doing this for
directory inode during active VFS lookup is likely to confuse the latter,
including VFS_BUG_ON_INODE() triggered in this case.
Link: https://lore.kernel.org/[email protected]
Fixes: 58b6fcd2ab34 ("ocfs2: mark inode bad upon validation failure during read")
Signed-off-by: Dmitry Antipov <[email protected]>
Suggested-by: Al Viro <[email protected]>
Reported-by: [email protected]
Closes: https://syzkaller.appspot.com/bug?extid=d222f4b7129379c3d5bc
Reviewed-by: Joseph Qi <[email protected]>
Cc: Mark Fasheh <[email protected]>
Cc: Joel Becker <[email protected]>
Cc: Junxiao Bi <[email protected]>
Cc: Changwei Ge <[email protected]>
Cc: Jun Piao <[email protected]>
Cc: Heming Zhao <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
fs/ocfs2/inode.c | 2 --
1 file changed, 2 deletions(-)
--- a/fs/ocfs2/inode.c~ocfs2-do-not-use-make_bad_inode-in-ocfs2_read_inode_block_full
+++ a/fs/ocfs2/inode.c
@@ -1952,8 +1952,6 @@ int ocfs2_read_inode_block_full(struct i
rc = ocfs2_read_blocks(INODE_CACHE(inode), OCFS2_I(inode)->ip_blkno,
1, &tmp, flags, ocfs2_validate_inode_block);
- if (rc < 0)
- make_bad_inode(inode);
/* If ocfs2_read_blocks() got us a new bh, pass it up. */
if (!rc && !*bh)
*bh = tmp;
_
Patches currently in -mm which might be from [email protected] are