public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-04 00:06:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfs: factor out a xfs_dir_lookup_args helper

Browse source 
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>
This commit is contained in:
Christoph Hellwig 2024-04-25 15:16:59 +02:00 • committed by Chandan Babu R
parent 08e012a62d
commit 14ee22fef4
3 changed files with 43 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
fs/xfs/libxfs/xfs_dir2.c
View file

@ -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;

2
fs/xfs/libxfs/xfs_dir2.h
View file

@ -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.
*/

35
fs/xfs/scrub/readdir.c
View file

@ -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;