Commit 4ae9cca3 authored by Joseph Qi's avatar Joseph Qi Committed by Andrew Morton
Browse files

ocfs2: remove empty extent list check in ocfs2_dx_dir_lookup_rec() 

The full extent list check is introduced by commit 44acc46d, 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: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Reviewed-by: default avatarHeming Zhao <heming.zhao@suse.com>
Cc: Changwei Ge <gechangwei@live.cn>
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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 775c1738

fs/ocfs2/dir.c

+3 −12
Original line number Diff line number Diff line
@@ -835,14 +835,6 @@ static int ocfs2_dx_dir_lookup_rec(struct inode *inode, 
		}

	}



	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(struct inode *inode, 


	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;

	}