From: Jan Kara <jack@suse.cz>
To: <linux-fsdevel@vger.kernel.org>
Cc: Jan Kara <jack@suse.cz>
Subject: [PATCH 07/20] udf: Convert udf_lookup() to use new directory iteration code
Date: Fri, 16 Dec 2022 16:24:11 +0100 [thread overview]
Message-ID: <20221216152656.6236-7-jack@suse.cz> (raw)
In-Reply-To: <20221216121344.14025-1-jack@suse.cz>
Convert udf_lookup() to use udf_fiiter_find_entry() for looking up
directory entries.
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/udf/namei.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index 145883d15c0f..efc75cf5722d 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -366,25 +366,22 @@ static struct dentry *udf_lookup(struct inode *dir, struct dentry *dentry,
unsigned int flags)
{
struct inode *inode = NULL;
- struct fileIdentDesc cfi;
- struct udf_fileident_bh fibh;
- struct fileIdentDesc *fi;
+ struct udf_fileident_iter iter;
+ int err;
if (dentry->d_name.len > UDF_NAME_LEN)
return ERR_PTR(-ENAMETOOLONG);
- fi = udf_find_entry(dir, &dentry->d_name, &fibh, &cfi);
- if (IS_ERR(fi))
- return ERR_CAST(fi);
+ err = udf_fiiter_find_entry(dir, &dentry->d_name, &iter);
+ if (err < 0 && err != -ENOENT)
+ return ERR_PTR(err);
- if (fi) {
+ if (err == 0) {
struct kernel_lb_addr loc;
- if (fibh.sbh != fibh.ebh)
- brelse(fibh.ebh);
- brelse(fibh.sbh);
+ loc = lelb_to_cpu(iter.fi.icb.extLocation);
+ udf_fiiter_release(&iter);
- loc = lelb_to_cpu(cfi.icb.extLocation);
inode = udf_iget(dir->i_sb, &loc);
if (IS_ERR(inode))
return ERR_CAST(inode);
--
2.35.3
next prev parent reply other threads:[~2022-12-16 15:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-16 15:24 [PATCH 0/20] udf: Fix various syzbot reports Jan Kara
2022-12-16 15:24 ` [PATCH 01/20] udf: Define EFSCORRUPTED error code Jan Kara
2022-12-16 15:24 ` [PATCH 02/20] udf: New directory iteration code Jan Kara
2022-12-18 5:34 ` kernel test robot
2022-12-16 15:24 ` [PATCH 03/20] udf: Convert udf_readdir() to new directory iteration Jan Kara
2022-12-16 15:24 ` [PATCH 04/20] udf: Convert udf_expand_dir_adinicb() " Jan Kara
2022-12-16 15:24 ` [PATCH 05/20] udf: Move udf_expand_dir_adinicb() to its callsite Jan Kara
2022-12-16 15:24 ` [PATCH 06/20] udf: Implement searching for directory entry using new iteration code Jan Kara
2022-12-16 15:24 ` Jan Kara [this message]
2022-12-16 15:24 ` [PATCH 08/20] udf: Convert udf_get_parent() to new directory " Jan Kara
2022-12-16 15:24 ` [PATCH 09/20] udf: Convert empty_dir() " Jan Kara
2022-12-16 15:24 ` [PATCH 10/20] udf: Provide function to mark entry as deleted using " Jan Kara
2022-12-16 15:24 ` [PATCH 11/20] udf: Convert udf_rmdir() to " Jan Kara
2022-12-16 15:24 ` [PATCH 12/20] udf: Convert udf_unlink() " Jan Kara
2022-12-16 15:24 ` [PATCH 13/20] udf: Implement adding of dir entries using new " Jan Kara
2022-12-16 15:24 ` [PATCH 14/20] udf: Convert udf_add_nondir() to new directory iteration Jan Kara
2022-12-16 15:24 ` [PATCH 15/20] udf: Convert udf_mkdir() to new directory iteration code Jan Kara
2022-12-16 15:24 ` [PATCH 16/20] udf: Convert udf_link() " Jan Kara
2022-12-16 15:24 ` [PATCH 17/20] udf: Convert udf_rename() " Jan Kara
2022-12-16 17:22 ` kernel test robot
2022-12-16 15:24 ` [PATCH 18/20] udf: Remove old " Jan Kara
2022-12-16 15:24 ` [PATCH 19/20] udf: Truncate added extents on failed expansion Jan Kara
2022-12-16 15:24 ` [PATCH 20/20] udf: Do not bother merging very long extents Jan Kara
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=20221216152656.6236-7-jack@suse.cz \
--to=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.