ocfs2-remove-empty-extent-list-check-in-ocfs2_dx_dir_lookup_rec.patch removed from -mm tree
The quilt patch titled
Subject: ocfs2: remove empty extent list check in ocfs2_dx_dir_lookup_rec()
has been removed from the -mm tree. Its filename was
ocfs2-remove-empty-extent-list-check-in-ocfs2_dx_dir_lookup_rec.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: Joseph Qi <[email protected]>
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.
---
fs/ocfs2/dir.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
fs/ocfs2/dir.c renamed from fs/ocfs2/dir.c~ocfs2-remove-empty-extent-list-check-in-ocfs2_dx_dir_lookup_rec +3 -12
@@ -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(strucif (!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 [email protected] are