xfs: factor out a xfs_dir_removename_args helper

Add a helper to switch between the different directory formats for
removing a directory entry.

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 e2727602d0479e4f332177710aeb6b00b3541af1..76aa11ade2e92d21b0b32710896686339f1aced4 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2.c
+++ b/fs/xfs/libxfs/xfs_dir2.c
@@ -444,6 +444,30 @@ xfs_dir_lookup(
        return rval;
 }
 
+int
+xfs_dir_removename_args(
+       struct xfs_da_args      *args)
+{
+       bool                    is_block, is_leaf;
+       int                     error;
+
+       if (args->dp->i_df.if_format == XFS_DINODE_FMT_LOCAL)
+               return xfs_dir2_sf_removename(args);
+
+       error = xfs_dir2_isblock(args, &is_block);
+       if (error)
+               return error;
+       if (is_block)
+               return xfs_dir2_block_removename(args);
+
+       error = xfs_dir2_isleaf(args, &is_leaf);
+       if (error)
+               return error;
+       if (is_leaf)
+               return xfs_dir2_leaf_removename(args);
+       return xfs_dir2_node_removename(args);
+}
+
 /*
  * Remove an entry from a directory.
  */
@@ -457,7 +481,6 @@ xfs_dir_removename(
 {
        struct xfs_da_args      *args;
        int                     rval;
-       bool                    v;
 
        ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
        XFS_STATS_INC(dp->i_mount, xs_dir_remove);
@@ -477,28 +500,7 @@ xfs_dir_removename(
        args->whichfork = XFS_DATA_FORK;
        args->trans = tp;
        args->owner = dp->i_ino;
-
-       if (dp->i_df.if_format == XFS_DINODE_FMT_LOCAL) {
-               rval = xfs_dir2_sf_removename(args);
-               goto out_free;
-       }
-
-       rval = xfs_dir2_isblock(args, &v);
-       if (rval)
-               goto out_free;
-       if (v) {
-               rval = xfs_dir2_block_removename(args);
-               goto out_free;
-       }
-
-       rval = xfs_dir2_isleaf(args, &v);
-       if (rval)
-               goto out_free;
-       if (v)
-               rval = xfs_dir2_leaf_removename(args);
-       else
-               rval = xfs_dir2_node_removename(args);
-out_free:
+       rval = xfs_dir_removename_args(args);
        kfree(args);
        return rval;
 }

diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h
index f5361dd7b90a93f6bfcc215422702f6ef3edd260..3db54801d69ecd7f934c5333cfb9ab4e1bfc6383 100644 (file)
--- a/fs/xfs/libxfs/xfs_dir2.h
+++ b/fs/xfs/libxfs/xfs_dir2.h
@@ -68,6 +68,7 @@ extern int xfs_dir_canenter(struct xfs_trans *tp, struct xfs_inode *dp,
 
 int xfs_dir_lookup_args(struct xfs_da_args *args);
 int xfs_dir_createname_args(struct xfs_da_args *args);
+int xfs_dir_removename_args(struct xfs_da_args *args);
 
 /*
  * Direct call from the bmap code, bypassing the generic directory layer.

diff --git a/fs/xfs/scrub/dir_repair.c b/fs/xfs/scrub/dir_repair.c
index a1e31b7827881c365ab43014ccb4c842f49e5151..98e4ed25cc230967c1d0c0ad56be41026384aa11 100644 (file)
--- a/fs/xfs/scrub/dir_repair.c
+++ b/fs/xfs/scrub/dir_repair.c
@@ -712,8 +712,6 @@ xrep_dir_replay_removename(
        xfs_extlen_t            total)
 {
        struct xfs_inode        *dp = rd->args.dp;
-       bool                    is_block, is_leaf;
-       int                     error;
 
        ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
 
@@ -722,23 +720,7 @@ xrep_dir_replay_removename(
        rd->args.total = total;
 
        trace_xrep_dir_replay_removename(dp, name, 0);
-
-       if (dp->i_df.if_format == XFS_DINODE_FMT_LOCAL)
-               return xfs_dir2_sf_removename(&rd->args);
-
-       error = xfs_dir2_isblock(&rd->args, &is_block);
-       if (error)
-               return error;
-       if (is_block)
-               return xfs_dir2_block_removename(&rd->args);
-
-       error = xfs_dir2_isleaf(&rd->args, &is_leaf);
-       if (error)
-               return error;
-       if (is_leaf)
-               return xfs_dir2_leaf_removename(&rd->args);
-
-       return xfs_dir2_node_removename(&rd->args);
+       return xfs_dir_removename_args(&rd->args);
 }
 
 /*