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

[ Upstream commit 200918b34d158cdaee531db7e0c80b92c57e66f1 ]

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>

diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index 16837278ab3ba8a5b7f7f9a2dd60a8f12091f96a..02fa9482e9cea2069d6c6a480a5e1591ee635b5b 100644 (file)
--- 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);