From: Christoph Hellwig Date: Wed, 22 Jan 2020 16:29:43 +0000 (-0500) Subject: xfs: devirtualize ->data_entry_tag_p X-Git-Tag: v5.5.0-rc0~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=823711f2229d0b54f60a665b7821a776ee2f2032;p=thirdparty%2Fxfsprogs-dev.git xfs: devirtualize ->data_entry_tag_p Source kernel commit: 7e8ae7bd1c5d806316e6b6403ac2dd0be7a1f82b Replace the ->data_entry_tag_p dir ops method with a directly called xfs_dir2_data_entry_tag_p helper that takes care of the differences between the directory format with and without the file type field. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- diff --git a/db/check.c b/db/check.c index c0665abe1..3d370ba96 100644 --- a/db/check.c +++ b/db/check.c @@ -2401,7 +2401,7 @@ process_data_dir_v2( (int)((char *)dep - (char *)data)); error++; } - tagp = M_DIROPS(mp)->data_entry_tag_p(dep); + tagp = libxfs_dir2_data_entry_tag_p(mp, dep); if ((char *)tagp >= endptr) { if (!sflag || v) dbprintf(_("dir %lld block %d bad entry at %d\n"), diff --git a/db/dir2.c b/db/dir2.c index 58f75b395..80f8991f4 100644 --- a/db/dir2.c +++ b/db/dir2.c @@ -486,7 +486,7 @@ dir2_data_union_tag_count( end = (char *)&dep->namelen + sizeof(dep->namelen); if (end > (char *)obj + mp->m_dir_geo->blksize) return 0; - tagp = M_DIROPS(mp)->data_entry_tag_p(dep); + tagp = libxfs_dir2_data_entry_tag_p(mp, dep); } end = (char *)tagp + sizeof(*tagp); return end <= (char *)obj + mp->m_dir_geo->blksize; @@ -508,7 +508,7 @@ dir2_data_union_tag_offset( return bitize((int)((char *)xfs_dir2_data_unused_tag_p(dup) - (char *)dup)); dep = (xfs_dir2_data_entry_t *)dup; - return bitize((int)((char *)M_DIROPS(mp)->data_entry_tag_p(dep) - + return bitize((int)((char *)libxfs_dir2_data_entry_tag_p(mp, dep) - (char *)dep)); } diff --git a/db/metadump.c b/db/metadump.c index 77e3b4ba4..104477920 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -1612,7 +1612,7 @@ process_dir_data_block( (long long)cur_ino); return; } - if (be16_to_cpu(*M_DIROPS(mp)->data_entry_tag_p(dep)) != + if (be16_to_cpu(*libxfs_dir2_data_entry_tag_p(mp, dep)) != dir_offset) return; @@ -1625,7 +1625,7 @@ process_dir_data_block( if (zero_stale_data) { /* 1 byte for ftype; don't bother with conditional */ int zlen = - (char *)M_DIROPS(mp)->data_entry_tag_p(dep) - + (char *)libxfs_dir2_data_entry_tag_p(mp, dep) - (char *)&dep->name[dep->namelen] - 1; if (zlen > 0) { memset(&dep->name[dep->namelen] + 1, 0, zlen); diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h index 208db077a..e095b7d60 100644 --- a/libxfs/libxfs_api_defs.h +++ b/libxfs/libxfs_api_defs.h @@ -85,6 +85,7 @@ #define xfs_dir2_data_make_free libxfs_dir2_data_make_free #define xfs_dir2_data_use_free libxfs_dir2_data_use_free #define xfs_dir2_data_entsize libxfs_dir2_data_entsize +#define xfs_dir2_data_entry_tag_p libxfs_dir2_data_entry_tag_p #define xfs_dir2_shrink_inode libxfs_dir2_shrink_inode #define xfs_dir2_sf_get_parent_ino libxfs_dir2_sf_get_parent_ino #define xfs_dir2_sf_put_parent_ino libxfs_dir2_sf_put_parent_ino diff --git a/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c index d54d6e288..a731dc97c 100644 --- a/libxfs/xfs_da_format.c +++ b/libxfs/xfs_da_format.c @@ -89,25 +89,6 @@ xfs_dir3_data_put_ftype( dep->name[dep->namelen] = type; } -/* - * Pointer to an entry's tag word. - */ -static __be16 * -xfs_dir2_data_entry_tag_p( - struct xfs_dir2_data_entry *dep) -{ - return (__be16 *)((char *)dep + - XFS_DIR2_DATA_ENTSIZE(dep->namelen) - sizeof(__be16)); -} - -static __be16 * -xfs_dir3_data_entry_tag_p( - struct xfs_dir2_data_entry *dep) -{ - return (__be16 *)((char *)dep + - XFS_DIR3_DATA_ENTSIZE(dep->namelen) - sizeof(__be16)); -} - static struct xfs_dir2_data_free * xfs_dir2_data_bestfree_p(struct xfs_dir2_data_hdr *hdr) { @@ -123,7 +104,6 @@ xfs_dir3_data_bestfree_p(struct xfs_dir2_data_hdr *hdr) static const struct xfs_dir_ops xfs_dir2_ops = { .data_get_ftype = xfs_dir2_data_get_ftype, .data_put_ftype = xfs_dir2_data_put_ftype, - .data_entry_tag_p = xfs_dir2_data_entry_tag_p, .data_bestfree_p = xfs_dir2_data_bestfree_p, .data_first_offset = sizeof(struct xfs_dir2_data_hdr) + @@ -135,7 +115,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = { static const struct xfs_dir_ops xfs_dir2_ftype_ops = { .data_get_ftype = xfs_dir3_data_get_ftype, .data_put_ftype = xfs_dir3_data_put_ftype, - .data_entry_tag_p = xfs_dir3_data_entry_tag_p, .data_bestfree_p = xfs_dir2_data_bestfree_p, .data_first_offset = sizeof(struct xfs_dir2_data_hdr) + @@ -147,7 +126,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = { static const struct xfs_dir_ops xfs_dir3_ops = { .data_get_ftype = xfs_dir3_data_get_ftype, .data_put_ftype = xfs_dir3_data_put_ftype, - .data_entry_tag_p = xfs_dir3_data_entry_tag_p, .data_bestfree_p = xfs_dir3_data_bestfree_p, .data_first_offset = sizeof(struct xfs_dir3_data_hdr) + diff --git a/libxfs/xfs_dir2.h b/libxfs/xfs_dir2.h index f717b1cdb..3f46954e9 100644 --- a/libxfs/xfs_dir2.h +++ b/libxfs/xfs_dir2.h @@ -35,7 +35,6 @@ struct xfs_dir_ops { uint8_t (*data_get_ftype)(struct xfs_dir2_data_entry *dep); void (*data_put_ftype)(struct xfs_dir2_data_entry *dep, uint8_t ftype); - __be16 * (*data_entry_tag_p)(struct xfs_dir2_data_entry *dep); struct xfs_dir2_data_free * (*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr); diff --git a/libxfs/xfs_dir2_block.c b/libxfs/xfs_dir2_block.c index 8d2354ead..8a1739b26 100644 --- a/libxfs/xfs_dir2_block.c +++ b/libxfs/xfs_dir2_block.c @@ -539,7 +539,7 @@ xfs_dir2_block_addname( dep->namelen = args->namelen; memcpy(dep->name, args->name, args->namelen); dp->d_ops->data_put_ftype(dep, args->filetype); - tagp = dp->d_ops->data_entry_tag_p(dep); + tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep); *tagp = cpu_to_be16((char *)dep - (char *)hdr); /* * Clean up the bestfree array and log the header, tail, and entry. @@ -1142,7 +1142,7 @@ xfs_dir2_sf_to_block( dep->namelen = 1; dep->name[0] = '.'; dp->d_ops->data_put_ftype(dep, XFS_DIR3_FT_DIR); - tagp = dp->d_ops->data_entry_tag_p(dep); + tagp = xfs_dir2_data_entry_tag_p(mp, dep); *tagp = cpu_to_be16(offset); xfs_dir2_data_log_entry(args, bp, dep); blp[0].hashval = cpu_to_be32(xfs_dir_hash_dot); @@ -1157,7 +1157,7 @@ xfs_dir2_sf_to_block( dep->namelen = 2; dep->name[0] = dep->name[1] = '.'; dp->d_ops->data_put_ftype(dep, XFS_DIR3_FT_DIR); - tagp = dp->d_ops->data_entry_tag_p(dep); + tagp = xfs_dir2_data_entry_tag_p(mp, dep); *tagp = cpu_to_be16(offset); xfs_dir2_data_log_entry(args, bp, dep); blp[1].hashval = cpu_to_be32(xfs_dir_hash_dotdot); @@ -1208,7 +1208,7 @@ xfs_dir2_sf_to_block( dep->namelen = sfep->namelen; dp->d_ops->data_put_ftype(dep, xfs_dir2_sf_get_ftype(mp, sfep)); memcpy(dep->name, sfep->name, dep->namelen); - tagp = dp->d_ops->data_entry_tag_p(dep); + tagp = xfs_dir2_data_entry_tag_p(mp, dep); *tagp = cpu_to_be16(newoffset); xfs_dir2_data_log_entry(args, bp, dep); name.name = sfep->name; diff --git a/libxfs/xfs_dir2_data.c b/libxfs/xfs_dir2_data.c index b18b73670..ea493c494 100644 --- a/libxfs/xfs_dir2_data.c +++ b/libxfs/xfs_dir2_data.c @@ -14,6 +14,7 @@ #include "xfs_inode.h" #include "xfs_dir2.h" #include "xfs_dir2_priv.h" +#include "xfs_dir2_priv.h" #include "xfs_trans.h" static xfs_failaddr_t xfs_dir2_data_freefind_verify( @@ -21,6 +22,18 @@ static xfs_failaddr_t xfs_dir2_data_freefind_verify( struct xfs_dir2_data_unused *dup, struct xfs_dir2_data_free **bf_ent); +/* + * Pointer to an entry's tag word. + */ +__be16 * +xfs_dir2_data_entry_tag_p( + struct xfs_mount *mp, + struct xfs_dir2_data_entry *dep) +{ + return (__be16 *)((char *)dep + + xfs_dir2_data_entsize(mp, dep->namelen) - sizeof(__be16)); +} + /* * The number of leaf entries is limited by the size of the block and the amount * of space used by the data entries. We don't know how much space is used by @@ -179,7 +192,7 @@ __xfs_dir3_data_check( return __this_address; if (offset + xfs_dir2_data_entsize(mp, dep->namelen) > end) return __this_address; - if (be16_to_cpu(*ops->data_entry_tag_p(dep)) != offset) + if (be16_to_cpu(*xfs_dir2_data_entry_tag_p(mp, dep)) != offset) return __this_address; if (ops->data_get_ftype(dep) >= XFS_DIR3_FT_MAX) return __this_address; @@ -605,7 +618,8 @@ xfs_dir2_data_freescan_int( /* * For active entries, check their tags and skip them. */ - ASSERT(offset == be16_to_cpu(*ops->data_entry_tag_p(dep))); + ASSERT(offset == + be16_to_cpu(*xfs_dir2_data_entry_tag_p(mp, dep))); offset += xfs_dir2_data_entsize(mp, dep->namelen); } } @@ -700,6 +714,7 @@ xfs_dir2_data_log_entry( struct xfs_buf *bp, xfs_dir2_data_entry_t *dep) /* data entry pointer */ { + struct xfs_mount *mp = bp->b_mount; struct xfs_dir2_data_hdr *hdr = bp->b_addr; ASSERT(hdr->magic == cpu_to_be32(XFS_DIR2_DATA_MAGIC) || @@ -708,7 +723,7 @@ xfs_dir2_data_log_entry( hdr->magic == cpu_to_be32(XFS_DIR3_BLOCK_MAGIC)); xfs_trans_log_buf(args->trans, bp, (uint)((char *)dep - (char *)hdr), - (uint)((char *)(args->dp->d_ops->data_entry_tag_p(dep) + 1) - + (uint)((char *)(xfs_dir2_data_entry_tag_p(mp, dep) + 1) - (char *)hdr - 1)); } diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c index a0cd60f3e..fa201d152 100644 --- a/libxfs/xfs_dir2_leaf.c +++ b/libxfs/xfs_dir2_leaf.c @@ -864,7 +864,7 @@ xfs_dir2_leaf_addname( dep->namelen = args->namelen; memcpy(dep->name, args->name, dep->namelen); dp->d_ops->data_put_ftype(dep, args->filetype); - tagp = dp->d_ops->data_entry_tag_p(dep); + tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep); *tagp = cpu_to_be16((char *)dep - (char *)hdr); /* * Need to scan fix up the bestfree table. diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c index b446bed7c..9ed02ab6b 100644 --- a/libxfs/xfs_dir2_node.c +++ b/libxfs/xfs_dir2_node.c @@ -1969,7 +1969,7 @@ xfs_dir2_node_addname_int( dep->namelen = args->namelen; memcpy(dep->name, args->name, dep->namelen); dp->d_ops->data_put_ftype(dep, args->filetype); - tagp = dp->d_ops->data_entry_tag_p(dep); + tagp = xfs_dir2_data_entry_tag_p(dp->i_mount, dep); *tagp = cpu_to_be16((char *)dep - (char *)hdr); xfs_dir2_data_log_entry(args, dbp, dep); diff --git a/libxfs/xfs_dir2_priv.h b/libxfs/xfs_dir2_priv.h index b97718eef..ca92a4102 100644 --- a/libxfs/xfs_dir2_priv.h +++ b/libxfs/xfs_dir2_priv.h @@ -58,6 +58,8 @@ extern int xfs_dir2_leaf_to_block(struct xfs_da_args *args, /* xfs_dir2_data.c */ int xfs_dir2_data_entsize(struct xfs_mount *mp, int n); +__be16 *xfs_dir2_data_entry_tag_p(struct xfs_mount *mp, + struct xfs_dir2_data_entry *dep); #ifdef DEBUG extern void xfs_dir3_data_check(struct xfs_inode *dp, struct xfs_buf *bp); diff --git a/repair/dir2.c b/repair/dir2.c index c15e8754c..398176d98 100644 --- a/repair/dir2.c +++ b/repair/dir2.c @@ -627,7 +627,7 @@ process_dir2_data( dep = (xfs_dir2_data_entry_t *)ptr; if (ptr + libxfs_dir2_data_entsize(mp, dep->namelen) > endptr) break; - if (be16_to_cpu(*M_DIROPS(mp)->data_entry_tag_p(dep)) != + if (be16_to_cpu(*libxfs_dir2_data_entry_tag_p(mp, dep)) != (char *)dep - (char *)d) break; ptr += libxfs_dir2_data_entsize(mp, dep->namelen); diff --git a/repair/phase6.c b/repair/phase6.c index 4c74d6f2d..88fc23318 100644 --- a/repair/phase6.c +++ b/repair/phase6.c @@ -1604,7 +1604,7 @@ longform_dir2_entry_check_data( dep = (xfs_dir2_data_entry_t *)ptr; if (ptr + libxfs_dir2_data_entsize(mp, dep->namelen) > endptr) break; - if (be16_to_cpu(*M_DIROPS(mp)->data_entry_tag_p(dep)) != + if (be16_to_cpu(*libxfs_dir2_data_entry_tag_p(mp, dep)) != (char *)dep - (char *)d) break; ptr += libxfs_dir2_data_entsize(mp, dep->namelen);