add higher level directory operations helpers v2
Hi all,
with the scrub and online repair code we now duplicate the switching between the directory format for directory operations in at least two places for each operation, with the metadir code adding even more for some of these operations.
This series adds _args helpers to consolidate this code, and then refactors the checking for the directory format into a single well-defined helper.
This is now based against the for-next branch in the xfs tree.
Changes since v1:
- removed two stray whitespaces in the last patch
Diffstat:
libxfs/xfs_dir2.c | 274 +++++++++++++++++++++++--------------------------- libxfs/xfs_dir2.h | 17 ++- libxfs/xfs_exchmaps.c | 9 - scrub/dir.c | 3 scrub/dir_repair.c | 58 ---------- scrub/readdir.c | 59 +--------- xfs_dir2_readdir.c | 19 +-- 7 files changed, 168 insertions(+), 271 deletions(-)
PATCH 1/5 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.
--- fs/xfs/libxfs/xfs_dir2.c | 66 ++++++++++++++++++++++++---------------- fs/xfs/libxfs/xfs_dir2.h | 2 ++ fs/xfs/scrub/readdir.c | 35 +-------------------- 3 files changed, 43 insertions(+), 60 deletions(-)
fs/xfs/libxfs/xfs_dir2.c +40 -26
@@ -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 @@ xfs_dir_lookup( ci_name->len = args->valuelen; } } -out_free:xfs_iunlock (dp, lock_mode);kfree (args);return rval;
fs/xfs/libxfs/xfs_dir2.h +2 -0
@@ -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. */
fs/xfs/scrub/readdir.c +1 -34
@@ -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;
Signature · 1 line
2.39.2
PATCH 2/5 xfs: factor out a xfs_dir_createname_args helper
In reply to Christoph HellwigAdd a helper to switch between the different directory formats for creating a directory entry and to handle the XFS_DA_OP_JUSTCHECK flag based on the passed in ino number field.
--- fs/xfs/libxfs/xfs_dir2.c | 53 +++++++++++++++++++++------------------ fs/xfs/libxfs/xfs_dir2.h | 1 + fs/xfs/scrub/dir_repair.c | 19 +------------- 3 files changed, 30 insertions(+), 43 deletions(-)
fs/xfs/libxfs/xfs_dir2.c +28 -25
@@ -256,6 +256,33 @@ xfs_dir_init(return error; } +int +xfs_dir_createname_args ( +struct xfs_da_args *args) +{ +bool is_block, is_leaf; +int error; + +if (!args->inumber) + args->op_flags |=XFS_DA_OP_JUSTCHECK ; + +if (args->dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) +return xfs_dir2_sf_addname (args); + + error =xfs_dir2_isblock (args, &is_block); +if (error) +return error; +if (is_block) +return xfs_dir2_block_addname (args); + + error =xfs_dir2_isleaf (args, &is_leaf); +if (error) +return error; +if (is_leaf) +return xfs_dir2_leaf_addname (args); +return xfs_dir2_node_addname (args); +} +/* * Enter a name in a directory, or check for available space. * If inum is 0, only the available space test is performed.
@@ -270,7 +297,6 @@ xfs_dir_createname( {struct xfs_da_args *args;int rval; -bool v;ASSERT (S_ISDIR (VFS_I (dp)->i_mode));
@@ -297,31 +323,8 @@ xfs_dir_createname( args->trans = tp; args->op_flags =XFS_DA_OP_ADDNAME |XFS_DA_OP_OKNOENT ; args->owner = dp->i_ino; -if (!inum) - args->op_flags |=XFS_DA_OP_JUSTCHECK ; - -if (dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) { - rval =xfs_dir2_sf_addname (args); - goto out_free; - } - rval =xfs_dir2_isblock (args, &v); -if (rval) - goto out_free; -if (v) { - rval =xfs_dir2_block_addname (args); - goto out_free; - } - - rval =xfs_dir2_isleaf (args, &v); -if (rval) - goto out_free; -if (v) - rval =xfs_dir2_leaf_addname (args); -else - rval =xfs_dir2_node_addname (args); - -out_free: + rval =xfs_dir_createname_args (args);kfree (args);return rval; }
fs/xfs/libxfs/xfs_dir2.h +1 -0
@@ -67,6 +67,7 @@ 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); +int xfs_dir_createname_args (struct xfs_da_args *args);/* * Direct call from the bmap code, bypassing the generic directory layer.
fs/xfs/scrub/dir_repair.c +1 -18
@@ -687,7 +687,6 @@ xrep_dir_replay_createname( {struct xfs_scrub *sc = rd->sc;struct xfs_inode *dp = rd->sc->tempip; -bool is_block, is_leaf;int error;ASSERT (S_ISDIR (VFS_I (dp)->i_mode));
@@ -702,23 +701,7 @@ xrep_dir_replay_createname( rd->args.inumber = inum; rd->args.total = total; rd->args.op_flags =XFS_DA_OP_ADDNAME |XFS_DA_OP_OKNOENT ; - -if (dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) -return xfs_dir2_sf_addname (&rd->args); - - error =xfs_dir2_isblock (&rd->args, &is_block); -if (error) -return error; -if (is_block) -return xfs_dir2_block_addname (&rd->args); - - error =xfs_dir2_isleaf (&rd->args, &is_leaf); -if (error) -return error; -if (is_leaf) -return xfs_dir2_leaf_addname (&rd->args); - -return xfs_dir2_node_addname (&rd->args); +return xfs_dir_createname_args (&rd->args); }/* Replay a stashed removename onto the temporary directory. */
Signature · 1 line
2.39.2
PATCH 3/5 xfs: factor out a xfs_dir_removename_args helper
In reply to Christoph HellwigAdd a helper to switch between the different directory formats for removing a directory entry.
--- fs/xfs/libxfs/xfs_dir2.c | 48 ++++++++++++++++++++------------------- fs/xfs/libxfs/xfs_dir2.h | 1 + fs/xfs/scrub/dir_repair.c | 20 +--------------- 3 files changed, 27 insertions(+), 42 deletions(-)
fs/xfs/libxfs/xfs_dir2.c +25 -23
@@ -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; }
fs/xfs/libxfs/xfs_dir2.h +1 -0
@@ -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.
fs/xfs/scrub/dir_repair.c +1 -19
@@ -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); }/*
Signature · 1 line
2.39.2
PATCH 4/5 xfs: factor out a xfs_dir_replace_args helper
In reply to Christoph HellwigAdd a helper to switch between the different directory formats for removing a directory entry.
--- fs/xfs/libxfs/xfs_dir2.c | 49 +++++++++++++++++++++------------------ fs/xfs/libxfs/xfs_dir2.h | 1 + fs/xfs/scrub/dir_repair.c | 19 +-------------- 3 files changed, 28 insertions(+), 41 deletions(-)
fs/xfs/libxfs/xfs_dir2.c +26 -23
@@ -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; }
fs/xfs/libxfs/xfs_dir2.h +1 -0
@@ -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.
fs/xfs/scrub/dir_repair.c +1 -18
@@ -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); }/*
Signature · 1 line
2.39.2
PATCH 5/5 xfs: refactor dir format helpers
In reply to Christoph HellwigAdd a new enum and a xfs_dir2_format helper that returns it to allow the code to switch on the format of a directory in a single operation and switch all helpers of xfs_dir2_isblock and xfs_dir2_isleaf to it.
This also removes the explicit xfs_iread_extents call in a few of the call sites given that xfs_bmap_last_offset already takes care of it underneath.
--- fs/xfs/libxfs/xfs_dir2.c | 188 ++++++++++++++--------------------- fs/xfs/libxfs/xfs_dir2.h | 12 ++- fs/xfs/libxfs/xfs_exchmaps.c | 9 +- fs/xfs/scrub/dir.c | 3 +- fs/xfs/scrub/readdir.c | 24 ++--- fs/xfs/xfs_dir2_readdir.c | 19 ++-- 6 files changed, 105 insertions(+), 150 deletions(-)
fs/xfs/libxfs/xfs_dir2.c +73 -115
@@ -256,31 +256,60 @@ xfs_dir_init(return error; } +enum xfs_dir2_fmt +xfs_dir2_format ( +struct xfs_da_args *args, +int *error) +{ +struct xfs_inode *dp = args->dp; +struct xfs_mount *mp = dp->i_mount; +struct xfs_da_geometry *geo = mp->m_dir_geo; +xfs_fileoff_t eof; + +xfs_assert_ilocked (dp,XFS_ILOCK_SHARED |XFS_ILOCK_EXCL ); + + *error =0 ; +if (dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) +return XFS_DIR2_FMT_SF ; + + *error =xfs_bmap_last_offset (dp, &eof,XFS_DATA_FORK ); +if (*error) +return XFS_DIR2_FMT_ERROR ; + +if (eof ==XFS_B_TO_FSB (mp, geo->blksize)) { +if (XFS_IS_CORRUPT (mp, dp->i_disk_size != geo->blksize)) { +xfs_da_mark_sick (args); + *error = -EFSCORRUPTED ; +return XFS_DIR2_FMT_ERROR ; + } +return XFS_DIR2_FMT_BLOCK ; + } +if (eof == geo->leafblk + geo->fsbcount) +return XFS_DIR2_FMT_LEAF ; +return XFS_DIR2_FMT_NODE ; +} +int xfs_dir_createname_args (struct xfs_da_args *args) { -bool is_block, is_leaf;int error;if (!args->inumber) args->op_flags |=XFS_DA_OP_JUSTCHECK ; -if (args->dp->i_df.if_format ==XFS_DINODE_FMT_LOCAL ) +switch (xfs_dir2_format (args, &error)) { +case XFS_DIR2_FMT_SF :return xfs_dir2_sf_addname (args); - - error =xfs_dir2_isblock (args, &is_block); -if (error) -return error; -if (is_block) +case XFS_DIR2_FMT_BLOCK :return xfs_dir2_block_addname (args); - - error =xfs_dir2_isleaf (args, &is_leaf); -if (error) -return error; -if (is_leaf) +case XFS_DIR2_FMT_LEAF :return xfs_dir2_leaf_addname (args); -return xfs_dir2_node_addname (args); +case XFS_DIR2_FMT_NODE : +return xfs_dir2_node_addname (args); +default : +return error; + } }/*
@@ -359,36 +388,25 @@ intxfs_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 ) { +switch (xfs_dir2_format (args, &error)) { +case XFS_DIR2_FMT_SF : 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) { +break ; +case XFS_DIR2_FMT_BLOCK : error =xfs_dir2_block_lookup (args); - goto out; - } - - error =xfs_dir2_isleaf (args, &is_leaf); -if (error) - goto out; -if (is_leaf) +break ; +case XFS_DIR2_FMT_LEAF : error =xfs_dir2_leaf_lookup (args); -else +break ; +case XFS_DIR2_FMT_NODE : error =xfs_dir2_node_lookup (args); -out: +break ; +default : +break ; + } +if (error != -EEXIST )return error;return 0 ;
@@ -448,24 +466,20 @@ intxfs_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 ) +switch (xfs_dir2_format (args, &error)) { +case XFS_DIR2_FMT_SF :return xfs_dir2_sf_removename (args); - - error =xfs_dir2_isblock (args, &is_block); -if (error) -return error; -if (is_block) +case XFS_DIR2_FMT_BLOCK :return xfs_dir2_block_removename (args); - - error =xfs_dir2_isleaf (args, &is_leaf); -if (error) -return error; -if (is_leaf) +case XFS_DIR2_FMT_LEAF :return xfs_dir2_leaf_removename (args); -return xfs_dir2_node_removename (args); +case XFS_DIR2_FMT_NODE : +return xfs_dir2_node_removename (args); +default : +return error; + } }/*
@@ -509,25 +523,20 @@ intxfs_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 ) +switch (xfs_dir2_format (args, &error)) { +case XFS_DIR2_FMT_SF :return xfs_dir2_sf_replace (args); - - error =xfs_dir2_isblock (args, &is_block); -if (error) -return error; -if (is_block) +case XFS_DIR2_FMT_BLOCK :return xfs_dir2_block_replace (args); - - error =xfs_dir2_isleaf (args, &is_leaf); -if (error) -return error; -if (is_leaf) +case XFS_DIR2_FMT_LEAF :return xfs_dir2_leaf_replace (args); - -return xfs_dir2_node_replace (args); +case XFS_DIR2_FMT_NODE : +return xfs_dir2_node_replace (args); +default : +return error; + } }/*
@@ -633,57 +642,6 @@ xfs_dir2_grow_inode(return 0 ; } -/* -* See if the directory is a single-block form directory. -*/ -int -xfs_dir2_isblock ( -struct xfs_da_args *args, -bool *isblock) -{ -struct xfs_mount *mp = args->dp->i_mount; -xfs_fileoff_t eof; -int error; - - error =xfs_bmap_last_offset (args->dp, &eof,XFS_DATA_FORK ); -if (error) -return error; - - *isblock = false; -if (XFS_FSB_TO_B (mp, eof) != args->geo->blksize) -return 0 ; - - *isblock = true; -if (XFS_IS_CORRUPT (mp, args->dp->i_disk_size != args->geo->blksize)) { -xfs_da_mark_sick (args); -return -EFSCORRUPTED ; - } -return 0 ; -} - -/* -* See if the directory is a single-leaf form directory. -*/ -int -xfs_dir2_isleaf ( -struct xfs_da_args *args, -bool *isleaf) -{ -xfs_fileoff_t eof; -int error; - - error =xfs_bmap_last_offset (args->dp, &eof,XFS_DATA_FORK ); -if (error) -return error; - - *isleaf = false; -if (eof != args->geo->leafblk + args->geo->fsbcount) -return 0 ; - - *isleaf = true; -return 0 ; -} -/* * Remove the given block from the directory. * This routine is used for data and free blocks, leaf/node are done
fs/xfs/libxfs/xfs_dir2.h +10 -2
@@ -36,6 +36,16 @@ xfs_dir2_samename(return !memcmp (n1->name, n2->name, n1->len); } +enum xfs_dir2_fmt { +XFS_DIR2_FMT_SF , +XFS_DIR2_FMT_BLOCK , +XFS_DIR2_FMT_LEAF , +XFS_DIR2_FMT_NODE , +XFS_DIR2_FMT_ERROR , +}; + +enum xfs_dir2_fmt xfs_dir2_format (struct xfs_da_args *args,int *error); +/* * Convert inode mode to directory entry filetype */
@@ -79,8 +89,6 @@ extern int xfs_dir2_sf_to_block(struct xfs_da_args *args);/* * Interface routines used by userspace utilities */ -extern int xfs_dir2_isblock (struct xfs_da_args *args,bool *isblock); -extern int xfs_dir2_isleaf (struct xfs_da_args *args,bool *isleaf);extern int xfs_dir2_shrink_inode (struct xfs_da_args *args,xfs_dir2_db_t db,struct xfs_buf *bp);
fs/xfs/libxfs/xfs_exchmaps.c +2 -7
@@ -465,17 +465,12 @@ xfs_exchmaps_dir_to_sf( };struct xfs_dir2_sf_hdr sfh;struct xfs_buf *bp; -bool isblock;int size; -int error; +int error =0 ; - error =xfs_dir2_isblock (&args, &isblock); -if (error) +if (xfs_dir2_format (&args, &error) !=XFS_DIR2_FMT_BLOCK )return error; -if (!isblock) -return 0 ; - error =xfs_dir3_block_read (tp, xmi->xmi_ip2, xmi->xmi_ip2->i_ino, &bp);if (error)return error;
fs/xfs/scrub/dir.c +2 -1
@@ -808,7 +808,8 @@ xchk_directory_blocks( free_lblk =XFS_B_TO_FSB (mp,XFS_DIR2_FREE_OFFSET );/* Is this a block dir? */ - error =xfs_dir2_isblock (&args, &is_block); +if (xfs_dir2_format (&args, &error) ==XFS_DIR2_FMT_BLOCK ) + is_block = true;if (!xchk_fblock_process_error (sc,XFS_DATA_FORK , lblk, &error)) goto out;
fs/xfs/scrub/readdir.c +9 -15
@@ -276,7 +276,6 @@ xchk_dir_walk( .trans = sc->tp, .owner = dp->i_ino, }; -bool isblock;int error;if (xfs_is_shutdown (dp->i_mount))
@@ -285,22 +284,17 @@ xchk_dir_walk(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 ) +switch (xfs_dir2_format (&args, &error)) { +case XFS_DIR2_FMT_SF :return xchk_dir_walk_sf (sc, dp, dirent_fn, priv); - -/* 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) +case XFS_DIR2_FMT_BLOCK :return xchk_dir_walk_block (sc, dp, dirent_fn, priv); - -return xchk_dir_walk_leaf (sc, dp, dirent_fn, priv); +case XFS_DIR2_FMT_LEAF : +case XFS_DIR2_FMT_NODE : +return xchk_dir_walk_leaf (sc, dp, dirent_fn, priv); +default : +return error; + } }/*
fs/xfs/xfs_dir2_readdir.c +9 -10
@@ -516,7 +516,6 @@ xfs_readdir( {struct xfs_da_args args = {NULL };unsigned int lock_mode; -bool isblock;int error;trace_xfs_readdir (dp);
@@ -539,18 +538,18 @@ xfs_readdir(return xfs_dir2_sf_getdents (&args, ctx); lock_mode =xfs_ilock_data_map_shared (dp); - error =xfs_dir2_isblock (&args, &isblock); -if (error) - goto out_unlock; - -if (isblock) { +switch (xfs_dir2_format (&args, &error)) { +case XFS_DIR2_FMT_BLOCK : error =xfs_dir2_block_getdents (&args, ctx, &lock_mode); - goto out_unlock; +break ; +case XFS_DIR2_FMT_LEAF : +case XFS_DIR2_FMT_NODE : + error =xfs_dir2_leaf_getdents (&args, ctx, bufsize, &lock_mode); +break ; +default : +break ; } - error =xfs_dir2_leaf_getdents (&args, ctx, bufsize, &lock_mode); - -out_unlock:if (lock_mode)xfs_iunlock (dp, lock_mode);return error;
Signature · 1 line
2.39.2
Quoted 7 lines · Christoph Hellwig
Hi all,
with the scrub and online repair code we now duplicate the switching between the directory format for directory operations in at least two places for each operation, with the metadir code adding even more for some of these operations.
Quoted 8 lines
This series adds
_argshelpers to consolidate this code, and then refactors the checking for the directory format into a single well-defined helper.This is now based against the for-next branch in the xfs tree.
Changes since v1:
- removed two stray whitespaces in the last patch
I had already applied patches from v1 and cleaned up the trailing whitespaces while doing so.
Signature · 1 line
Chandan