From: Joseph Qi <joseph.qi@linux.alibaba.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Heming Zhao <heming.zhao@suse.com>,
ZhengYuan Huang <gality369@gmail.com>
Cc: ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] ocfs2: remove empty extent list check in ocfs2_dx_dir_lookup_rec()
Date: Fri, 3 Apr 2026 17:08:01 +0800 [thread overview]
Message-ID: <20260403090803.3860971-3-joseph.qi@linux.alibaba.com> (raw)
In-Reply-To: <20260403090803.3860971-1-joseph.qi@linux.alibaba.com>
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.
Signed-off-by: Joseph Qi <joseph.qi@linux.alibaba.com>
---
fs/ocfs2/dir.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index 82e720c8ba32..d94595a49923 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -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;
}
--
2.39.3
next prev parent reply other threads:[~2026-04-03 9:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-03 9:07 [PATCH 0/4] ocfs2: consolidate extent list validation into block read callbacks Joseph Qi
2026-04-03 9:08 ` [PATCH 1/4] ocfs2: validate dx_root extent list fields during block read Joseph Qi
2026-04-07 14:58 ` Heming Zhao
2026-04-03 9:08 ` Joseph Qi [this message]
2026-04-07 14:59 ` [PATCH 2/4] ocfs2: remove empty extent list check in ocfs2_dx_dir_lookup_rec() Heming Zhao
2026-04-03 9:08 ` [PATCH 3/4] ocfs2: validate extent block list fields during block read Joseph Qi
2026-04-07 15:00 ` Heming Zhao
2026-04-03 9:08 ` [PATCH 4/4] ocfs2: remove redundant l_next_free_rec check in __ocfs2_find_path() Joseph Qi
2026-04-07 15:01 ` Heming Zhao
2026-04-03 19:27 ` [PATCH 0/4] ocfs2: consolidate extent list validation into block read callbacks Andrew Morton
2026-04-07 1:44 ` Joseph Qi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260403090803.3860971-3-joseph.qi@linux.alibaba.com \
--to=joseph.qi@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=gality369@gmail.com \
--cc=heming.zhao@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ocfs2-devel@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®