shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

udf: Convert udf_lookup() to use new directory iteration code

Browse Source 
[ Upstream commit 200918b34d ]

Convert udf_lookup() to use udf_fiiter_find_entry() for looking up
directory entries.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jan Kara
2024-10-17 14:19:04 -03:00
committed by Greg Kroah-Hartman
parent 31f1ca5c4f
commit 0f7fd74594
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fs/udf/namei.c
View File

@@ -366,25 +366,22 @@ static struct dentry *udf_lookup(struct inode *dir, struct dentry *dentry,
unsigned int flags) unsigned int flags)
{ {
struct inode *inode = NULL; struct inode *inode = NULL;
struct fileIdentDesc cfi; struct udf_fileident_iter iter;
struct udf_fileident_bh fibh; int err;
struct fileIdentDesc *fi;
if (dentry->d_name.len > UDF_NAME_LEN) if (dentry->d_name.len > UDF_NAME_LEN)
return ERR_PTR(-ENAMETOOLONG); return ERR_PTR(-ENAMETOOLONG);
fi = udf_find_entry(dir, &dentry->d_name, &fibh, &cfi); err = udf_fiiter_find_entry(dir, &dentry->d_name, &iter);
if (IS_ERR(fi)) if (err < 0 && err != -ENOENT)
return ERR_CAST(fi); return ERR_PTR(err);
if (fi) { if (err == 0) {
struct kernel_lb_addr loc; struct kernel_lb_addr loc;
if (fibh.sbh != fibh.ebh) loc = lelb_to_cpu(iter.fi.icb.extLocation);
brelse(fibh.ebh); udf_fiiter_release(&iter);
brelse(fibh.sbh);
loc = lelb_to_cpu(cfi.icb.extLocation);
inode = udf_iget(dir->i_sb, &loc); inode = udf_iget(dir->i_sb, &loc);
if (IS_ERR(inode)) if (IS_ERR(inode))
return ERR_CAST(inode); return ERR_CAST(inode);