+ ocfs2-remove-empty-extent-list-check-in-ocfs2_dx_dir_lookup_rec.patch added to mm-nonmm-unstable branch

Andrew Morton
2026-04-03T17:14:26Z

The patch titled
Subject: ocfs2: remove empty extent list check in ocfs2_dx_dir_lookup_rec()
has been added to the -mm mm-nonmm-unstable branch. Its filename is
ocfs2-remove-empty-extent-list-check-in-ocfs2_dx_dir_lookup_rec.patch

This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/ocfs2-remove-empty-extent-list-check-in-ocfs2_dx_dir_lookup_rec.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 <joseph.qi@linux.alibaba.com>
Subject: ocfs2: remove empty extent list check in ocfs2_dx_dir_lookup_rec()
Date: Fri, 3 Apr 2026 17:08:01 +0800

The full extent list check is introduced by commit 44acc46d182f, which is
to avoid NULL pointer dereference if a dirent is not found.

Reworking the error message to not reference rec. Instead, report
major_hash being looked up and l_next_free_rec, which naturally covers
both failure cases (empty extent list and no matching record) without
needing a separate l_next_free_rec == 0 guard.

Link: https://lkml.kernel.org/r/20260403090803.3860971-3-joseph.qi@linux.alibaba.com
Signed-off-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Heming Zhao <heming.zhao@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Jun Piao <piaojun@huawei.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Mark Fasheh <mark@fasheh.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

fs/ocfs2/dir.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)

--- a/fs/ocfs2/dir.c~ocfs2-remove-empty-extent-list-check-in-ocfs2_dx_dir_lookup_rec
+++ a/fs/ocfs2/dir.c
@@ -835,14 +835,6 @@ static int ocfs2_dx_dir_lookup_rec(struc
}
}

- if (le16_to_cpu(el->l_next_free_rec) == 0) {
- ret = ocfs2_error(inode->i_sb,
- "Inode %lu has empty extent list at depth %u\n",
- inode->i_ino,
- le16_to_cpu(el->l_tree_depth));
- goto out;
- }
-
found = 0;
for (i = le16_to_cpu(el->l_next_free_rec) - 1; i >= 0; i--) {
rec = &el->l_recs[i];
@@ -855,10 +847,9 @@ static int ocfs2_dx_dir_lookup_rec(struc

if (!found) {
ret = ocfs2_error(inode->i_sb,
- "Inode %lu has bad extent record (%u, %u, 0) in btree\n",
- inode->i_ino,
- le32_to_cpu(rec->e_cpos),
- ocfs2_rec_clusters(el, rec));
+ "Inode %lu has no extent record for hash %u in btree (next_free_rec %u)\n",
+ inode->i_ino, major_hash,
+ le16_to_cpu(el->l_next_free_rec));
goto out;
}

_

Patches currently in -mm which might be from joseph.qi@linux.alibaba.com are

ocfs2-fix-out-of-bounds-write-in-ocfs2_write_end_inline.patch
ocfs2-validate-dx_root-extent-list-fields-during-block-read.patch
ocfs2-remove-empty-extent-list-check-in-ocfs2_dx_dir_lookup_rec.patch
ocfs2-validate-extent-block-list-fields-during-block-read.patch
ocfs2-remove-redundant-l_next_free_rec-check-in-__ocfs2_find_path.patch