kevin/linux
1
Fork 0
Code

xfs: factor out a xfs_dir_replace_args helper

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2024-04-25 15:17:02 +02:00 committed by Chandan Babu R
parent 3866e6e669
commit dfe5febe2b
3 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fs/xfs/libxfs/xfs_dir2.c
View File

@ -505,6 +505,31 @@ xfs_dir_removename(
return rval;
}
int
xfs_dir_replace_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_replace(args);
error = xfs_dir2_isblock(args, &is_block);
if (error)
return error;
if (is_block)
return xfs_dir2_block_replace(args);
error = xfs_dir2_isleaf(args, &is_leaf);
if (error)
return error;
if (is_leaf)
return xfs_dir2_leaf_replace(args);
return xfs_dir2_node_replace(args);
}
/*
* Replace the inode number of a directory entry.
*/
@ -518,7 +543,6 @@ xfs_dir_replace(
{
struct xfs_da_args *args;
int rval;
bool v;
ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
@ -541,28 +565,7 @@ xfs_dir_replace(
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_replace(args);
goto out_free;
}
rval = xfs_dir2_isblock(args, &v);
if (rval)
goto out_free;
if (v) {
rval = xfs_dir2_block_replace(args);
goto out_free;
}
rval = xfs_dir2_isleaf(args, &v);
if (rval)
goto out_free;
if (v)
rval = xfs_dir2_leaf_replace(args);
else
rval = xfs_dir2_node_replace(args);
out_free:
rval = xfs_dir_replace_args(args);
kfree(args);
return rval;
}

1
fs/xfs/libxfs/xfs_dir2.h
View File

@ -69,6 +69,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);
int xfs_dir_replace_args(struct xfs_da_args *args);
/*
* Direct call from the bmap code, bypassing the generic directory layer.

19
fs/xfs/scrub/dir_repair.c
View File

@ -1513,7 +1513,6 @@ xrep_dir_replace(
xfs_extlen_t total)
{
struct xfs_scrub *sc = rd->sc;
bool is_block, is_leaf;
int error;
ASSERT(S_ISDIR(VFS_I(dp)->i_mode));
@ -1525,23 +1524,7 @@ xrep_dir_replace(
xrep_dir_init_args(rd, dp, name);
rd->args.inumber = inum;
rd->args.total = total;
if (dp->i_df.if_format == XFS_DINODE_FMT_LOCAL)
return xfs_dir2_sf_replace(&rd->args);
error = xfs_dir2_isblock(&rd->args, &is_block);
if (error)
return error;
if (is_block)
return xfs_dir2_block_replace(&rd->args);
error = xfs_dir2_isleaf(&rd->args, &is_leaf);
if (error)
return error;
if (is_leaf)
return xfs_dir2_leaf_replace(&rd->args);
return xfs_dir2_node_replace(&rd->args);
return xfs_dir_replace_args(&rd->args);
}
/*