Commit 7e8ae7bd authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: devirtualize ->data_entry_tag_p 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent fdbb8c5b

fs/xfs/libxfs/xfs_da_format.c

+0 −22
Original line number Diff line number Diff line
@@ -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) +

fs/xfs/libxfs/xfs_dir2.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

fs/xfs/libxfs/xfs_dir2_block.c

+4 −4
Original line number Diff line number Diff line
@@ -542,7 +542,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.
@@ -1145,7 +1145,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);
@@ -1160,7 +1160,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);
@@ -1211,7 +1211,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;

fs/xfs/libxfs/xfs_dir2_data.c

+18 −3
Original line number Diff line number Diff line
@@ -18,12 +18,25 @@ 
#include "xfs_trans.h"

#include "xfs_buf_item.h"

#include "xfs_log.h"

#include "xfs_dir2_priv.h"



static xfs_failaddr_t xfs_dir2_data_freefind_verify(

		struct xfs_dir2_data_hdr *hdr, struct xfs_dir2_data_free *bf,

		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
@@ -182,7 +195,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;
@@ -608,7 +621,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);

	}

}
@@ -703,6 +717,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) ||
@@ -711,7 +726,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));

}

fs/xfs/libxfs/xfs_dir2_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE