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

diff --git a/fs/ocfs2/sysfile.c b/fs/ocfs2/sysfile.c
index 5df6e35d09b1..fd2e846e3e6f 100644
--- a/fs/ocfs2/sysfile.c
+++ b/fs/ocfs2/sysfile.c
@@ -100,17 +100,14 @@ static struct inode * _ocfs2_get_system_file_inode(struct ocfs2_super *osb,
         char namebuf[40];
         struct inode *inode = NULL;
         u64 blkno;
-        struct buffer_head *dirent_bh = NULL;
-        struct ocfs2_dir_entry *de = NULL;
         int status = 0;
 
         ocfs2_sprintf_system_inode_name(namebuf,
                                         sizeof(namebuf),
                                         type, slot);
 
-        status = ocfs2_find_files_on_disk(namebuf, strlen(namebuf),
-                                          &blkno, osb->sys_root_inode,
-                                          &dirent_bh, &de);
+        status = ocfs2_lookup_ino_from_name(osb->sys_root_inode, namebuf,
+                                            strlen(namebuf), &blkno);
         if (status < 0) {
                 goto bail;
         }
@@ -122,8 +119,7 @@ static struct inode * _ocfs2_get_system_file_inode(struct ocfs2_super *osb,
                 goto bail;
         }
 bail:
-        if (dirent_bh)
-                brelse(dirent_bh);
+
         return inode;
 }