xfs: factor out a xfs_dir_lookup_args helper

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/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c
index 7634344dc5153891cd7533ca180ecb3f20fabdc9..b4f9359089117e12eab40a7a26de4c056ccc73e0 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2.c
+++ b/fs/xfs/libxfs/xfs_dir2.c
@@ -352,6 +352,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
@@ -368,7 +407,6 @@ xfs_dir_lookup(
 {
        struct xfs_da_args      *args;
        int                     rval;
-       bool                    v;
        int                     lock_mode;
 
        ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
@@ -390,30 +428,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) {
@@ -421,7 +436,6 @@ out_check_rval:
                        ci_name->len = args->valuelen;
                }
        }
-out_free:
        xfs_iunlock(dp, lock_mode);
        kfree(args);
        return rval;

diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
index b580a78bcf4fc29d79cb429af634768d5f926228..982c2249bfa3054d7dd9e96584f9330146f3d925 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2.h
+++ b/fs/xfs/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.
  */

diff --git a/fs/xfs/scrub/readdir.c b/fs/xfs/scrub/readdir.c
index 28a94c78b0b199fef9ae92682d72c08869092f90..0ac77359d8e9f8f06a9f7b12d5731ab9522abb07 100644 (file)
--- a/fs/xfs/scrub/readdir.c
+++ b/fs/xfs/scrub/readdir.c
@@ -328,7 +328,6 @@ xchk_dir_lookup(
                .op_flags       = XFS_DA_OP_OKNOENT,
                .owner          = dp->i_ino,
        };
-       bool                    isblock, isleaf;
        int                     error;
 
        if (xfs_is_shutdown(dp->i_mount))
@@ -344,39 +343,7 @@ xchk_dir_lookup(
        ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
        xfs_assert_ilocked(dp, XFS_ILOCK_SHARED | XFS_ILOCK_EXCL);
 
-       if (dp->i_df.if_format == XFS_DINODE_FMT_LOCAL) {
-               error = xfs_dir2_sf_lookup(&args);
-               goto out_check_rval;
-       }
-
-       /* dir2 functions require that the data fork is loaded */
-       error = xfs_iread_extents(sc->tp, dp, XFS_DATA_FORK);
-       if (error)
-               return error;
-
-       error = xfs_dir2_isblock(&args, &isblock);
-       if (error)
-               return error;
-
-       if (isblock) {
-               error = xfs_dir2_block_lookup(&args);
-               goto out_check_rval;
-       }
-
-       error = xfs_dir2_isleaf(&args, &isleaf);
-       if (error)
-               return error;
-
-       if (isleaf) {
-               error = xfs_dir2_leaf_lookup(&args);
-               goto out_check_rval;
-       }
-
-       error = xfs_dir2_node_lookup(&args);
-
-out_check_rval:
-       if (error == -EEXIST)
-               error = 0;
+       error = xfs_dir_lookup_args(&args);
        if (!error)
                *ino = args.inumber;
        return error;