mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
udf: Convert udf_lookup() to use new directory iteration code
Convert udf_lookup() to use udf_fiiter_find_entry() for looking up directory entries. Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
1c80afa04d
commit
200918b34d
1 changed files with 8 additions and 11 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue