xfs: factor out a xfs_dir_lookup_args helper

Source kernel commit: 14ee22fef420c864c0869419e54aa4e88f64b4e6

Add a helper to switch between the different directory formats for
lookup and to handle the -EEXIST return for a successful lookup.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>

diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c
index e309e1e58c49dd4cbc1e0365a45cdbd7e7878853..0cf4120fe8f0aa3f070a040a028832fb76125589 100644 (file)
--- a/libxfs/xfs_dir2.c
+++ b/libxfs/xfs_dir2.c
@@ -351,6 +351,45 @@ xfs_dir_cilookup_result(
        return -EEXIST;
 }
 
+int
+xfs_dir_lookup_args(
+       struct xfs_da_args      *args)
+{
+       bool                    is_block, is_leaf;
+       int                     error;
+
+       if (args->dp->i_df.if_format == XFS_DINODE_FMT_LOCAL) {
+               error = xfs_dir2_sf_lookup(args);
+               goto out;
+       }
+
+       /* dir2 functions require that the data fork is loaded */
+       error = xfs_iread_extents(args->trans, args->dp, XFS_DATA_FORK);
+       if (error)
+               goto out;
+
+       error = xfs_dir2_isblock(args, &is_block);
+       if (error)
+               goto out;
+
+       if (is_block) {
+               error = xfs_dir2_block_lookup(args);
+               goto out;
+       }
+
+       error = xfs_dir2_isleaf(args, &is_leaf);
+       if (error)
+               goto out;
+       if (is_leaf)
+               error = xfs_dir2_leaf_lookup(args);
+       else
+               error = xfs_dir2_node_lookup(args);
+out:
+       if (error != -EEXIST)
+               return error;
+       return 0;
+}
+
 /*
  * Lookup a name in a directory, give back the inode number.
  * If ci_name is not NULL, returns the actual name in ci_name if it differs
@@ -367,7 +406,6 @@ xfs_dir_lookup(
 {
        struct xfs_da_args      *args;
        int                     rval;
-       bool                    v;
        int                     lock_mode;
 
        ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
@@ -389,30 +427,7 @@ xfs_dir_lookup(
                args->op_flags |= XFS_DA_OP_CILOOKUP;
 
        lock_mode = xfs_ilock_data_map_shared(dp);
-       if (dp->i_df.if_format == XFS_DINODE_FMT_LOCAL) {
-               rval = xfs_dir2_sf_lookup(args);
-               goto out_check_rval;
-       }
-
-       rval = xfs_dir2_isblock(args, &v);
-       if (rval)
-               goto out_free;
-       if (v) {
-               rval = xfs_dir2_block_lookup(args);
-               goto out_check_rval;
-       }
-
-       rval = xfs_dir2_isleaf(args, &v);
-       if (rval)
-               goto out_free;
-       if (v)
-               rval = xfs_dir2_leaf_lookup(args);
-       else
-               rval = xfs_dir2_node_lookup(args);
-
-out_check_rval:
-       if (rval == -EEXIST)
-               rval = 0;
+       rval = xfs_dir_lookup_args(args);
        if (!rval) {
                *inum = args->inumber;
                if (ci_name) {
@@ -420,7 +435,6 @@ out_check_rval:
                        ci_name->len = args->valuelen;
                }
        }
-out_free:
        xfs_iunlock(dp, lock_mode);
        kfree(args);
        return rval;

diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h
index b580a78bcf4fc29d79cb429af634768d5f926228..982c2249bfa3054d7dd9e96584f9330146f3d925 100644 (file)
--- a/libxfs/xfs_dir2.h
+++ b/libxfs/xfs_dir2.h
@@ -66,6 +66,8 @@ extern int xfs_dir_replace(struct xfs_trans *tp, struct xfs_inode *dp,
 extern int xfs_dir_canenter(struct xfs_trans *tp, struct xfs_inode *dp,
                                struct xfs_name *name);
 
+int xfs_dir_lookup_args(struct xfs_da_args *args);
+
 /*
  * Direct call from the bmap code, bypassing the generic directory layer.
  */