ocfs2: Provide convenience function for ino lookup

A couple paths which needed to just match a parent dir + name pair to an
inode number were a bit messy because they had to deal with
ocfs2_find_files_on_disk() which returns a larger number of values. Provide
a convenience function, ocfs2_lookup_ino_from_name() which internalizes all
the extra accounting.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Reviewed-by: Joel Becker <joel.becker@oracle.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index aae6c0bf6696..98aeebc2c9fa 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -101,10 +101,8 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry,
 {
         int status;
         u64 blkno;
-        struct buffer_head *dirent_bh = NULL;
         struct inode *inode = NULL;
         struct dentry *ret;
-        struct ocfs2_dir_entry *dirent;
         struct ocfs2_inode_info *oi;
 
         mlog_entry("(0x%p, 0x%p, '%.*s')\n", dir, dentry,
@@ -126,9 +124,8 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry,
                 goto bail;
         }
 
-        status = ocfs2_find_files_on_disk(dentry->d_name.name,
-                                          dentry->d_name.len, &blkno,
-                                          dir, &dirent_bh, &dirent);
+        status = ocfs2_lookup_ino_from_name(dir, dentry->d_name.name,
+                                            dentry->d_name.len, &blkno);
         if (status < 0)
                 goto bail_add;
 
@@ -183,8 +180,6 @@ bail_unlock:
         ocfs2_meta_unlock(dir, 0);
 
 bail:
-        if (dirent_bh)
-                brelse(dirent_bh);
 
         mlog_exit_ptr(ret);