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, 1 insertions, 7 deletions

diff --git a/fs/ocfs2/export.c b/fs/ocfs2/export.c
index bc48177bd183..c3bbc198f9ce 100644
--- a/fs/ocfs2/export.c
+++ b/fs/ocfs2/export.c
@@ -88,8 +88,6 @@ static struct dentry *ocfs2_get_parent(struct dentry *child)
         struct dentry *parent;
         struct inode *inode;
         struct inode *dir = child->d_inode;
-        struct buffer_head *dirent_bh = NULL;
-        struct ocfs2_dir_entry *dirent;
 
         mlog_entry("(0x%p, '%.*s')\n", child,
                    child->d_name.len, child->d_name.name);
@@ -105,8 +103,7 @@ static struct dentry *ocfs2_get_parent(struct dentry *child)
                 goto bail;
         }
 
-        status = ocfs2_find_files_on_disk("..", 2, &blkno, dir, &dirent_bh,
-                                          &dirent);
+        status = ocfs2_lookup_ino_from_name(dir, "..", 2, &blkno);
         if (status < 0) {
                 parent = ERR_PTR(-ENOENT);
                 goto bail_unlock;
@@ -131,9 +128,6 @@ static struct dentry *ocfs2_get_parent(struct dentry *child)
 bail_unlock:
         ocfs2_meta_unlock(dir, 0);
 
-        if (dirent_bh)
-                brelse(dirent_bh);
-
 bail:
         mlog_exit_ptr(parent);