Commit 1848b607 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: devirtualize ->data_bestfree_p 



Replace the ->data_bestfree_p dir ops method with a directly called
xfs_dir2_data_bestfree_p helper that takes care of the differences
between the v4 and v5 on-disk format.

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 711c7dbf

fs/xfs/libxfs/xfs_da_format.c

+0 −15
Original line number Diff line number Diff line
@@ -56,34 +56,19 @@ xfs_dir3_data_put_ftype( 
	dep->name[dep->namelen] = type;

}



static struct xfs_dir2_data_free *

xfs_dir2_data_bestfree_p(struct xfs_dir2_data_hdr *hdr)

{

	return hdr->bestfree;

}



static struct xfs_dir2_data_free *

xfs_dir3_data_bestfree_p(struct xfs_dir2_data_hdr *hdr)

{

	return ((struct xfs_dir3_data_hdr *)hdr)->best_free;

}



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_bestfree_p = xfs_dir2_data_bestfree_p,

};



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_bestfree_p = xfs_dir2_data_bestfree_p,

};



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_bestfree_p = xfs_dir3_data_bestfree_p,

};



/*

fs/xfs/libxfs/xfs_dir2.h

+0 −3
Original line number Diff line number Diff line
@@ -35,8 +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);

	struct xfs_dir2_data_free *

		(*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr);

};



extern const struct xfs_dir_ops *
@@ -81,7 +79,6 @@ extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db, 
				struct xfs_buf *bp);



extern void xfs_dir2_data_freescan_int(struct xfs_mount *mp,

		const struct xfs_dir_ops *ops,

		struct xfs_dir2_data_hdr *hdr, int *loghead);

extern void xfs_dir2_data_freescan(struct xfs_inode *dp,

		struct xfs_dir2_data_hdr *hdr, int *loghead);

fs/xfs/libxfs/xfs_dir2_block.c

+3 −3
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ xfs_dir2_block_need_space( 
	struct xfs_dir2_data_unused	*enddup = NULL;



	*compact = 0;

	bf = dp->d_ops->data_bestfree_p(hdr);

	bf = xfs_dir2_data_bestfree_p(dp->i_mount, hdr);



	/*

	 * If there are stale entries we'll use one for the leaf.
@@ -1199,7 +1199,7 @@ xfs_dir2_sf_to_block( 
			*xfs_dir2_data_unused_tag_p(dup) = cpu_to_be16(offset);

			xfs_dir2_data_log_unused(args, bp, dup);

			xfs_dir2_data_freeinsert(hdr,

						 dp->d_ops->data_bestfree_p(hdr),

					xfs_dir2_data_bestfree_p(mp, hdr),

					dup, &dummy);

			offset += be16_to_cpu(dup->length);

			continue;

fs/xfs/libxfs/xfs_dir2_data.c

+16 −7
Original line number Diff line number Diff line
@@ -25,6 +25,16 @@ static xfs_failaddr_t xfs_dir2_data_freefind_verify( 
		struct xfs_dir2_data_unused *dup,

		struct xfs_dir2_data_free **bf_ent);



struct xfs_dir2_data_free *

xfs_dir2_data_bestfree_p(

	struct xfs_mount		*mp,

	struct xfs_dir2_data_hdr	*hdr)

{

	if (xfs_sb_version_hascrc(&mp->m_sb))

		return ((struct xfs_dir3_data_hdr *)hdr)->best_free;

	return hdr->bestfree;

}



/*

 * Pointer to an entry's tag word.

 */
@@ -121,7 +131,7 @@ __xfs_dir3_data_check( 
	/*

	 * Account for zero bestfree entries.

	 */

	bf = ops->data_bestfree_p(hdr);

	bf = xfs_dir2_data_bestfree_p(mp, hdr);

	count = lastfree = freeseen = 0;

	if (!bf[0].length) {

		if (bf[0].offset)
@@ -581,12 +591,11 @@ xfs_dir2_data_freeremove( 
void

xfs_dir2_data_freescan_int(

	struct xfs_mount		*mp,

	const struct xfs_dir_ops	*ops,

	struct xfs_dir2_data_hdr	*hdr,

	int				*loghead)

{

	struct xfs_da_geometry		*geo = mp->m_dir_geo;

	struct xfs_dir2_data_free	*bf = ops->data_bestfree_p(hdr);

	struct xfs_dir2_data_free	*bf = xfs_dir2_data_bestfree_p(mp, hdr);

	void				*addr = hdr;

	unsigned int			offset = geo->data_entry_offset;

	unsigned int			end;
@@ -633,7 +642,7 @@ xfs_dir2_data_freescan( 
	struct xfs_dir2_data_hdr *hdr,

	int			*loghead)

{

	return xfs_dir2_data_freescan_int(dp->i_mount, dp->d_ops, hdr, loghead);

	return xfs_dir2_data_freescan_int(dp->i_mount, hdr, loghead);

}



/*
@@ -683,7 +692,7 @@ xfs_dir3_data_init( 
	} else

		hdr->magic = cpu_to_be32(XFS_DIR2_DATA_MAGIC);



	bf = dp->d_ops->data_bestfree_p(hdr);

	bf = xfs_dir2_data_bestfree_p(mp, hdr);

	bf[0].offset = cpu_to_be16(geo->data_entry_offset);

	bf[0].length = cpu_to_be16(geo->blksize - geo->data_entry_offset);

	for (i = 1; i < XFS_DIR2_DATA_FD_COUNT; i++) {
@@ -841,7 +850,7 @@ xfs_dir2_data_make_free( 
	 * Previous and following entries are both free,

	 * merge everything into a single free entry.

	 */

	bf = args->dp->d_ops->data_bestfree_p(hdr);

	bf = xfs_dir2_data_bestfree_p(args->dp->i_mount, hdr);

	if (prevdup && postdup) {

		xfs_dir2_data_free_t	*dfp2;	/* another bestfree pointer */
@@ -1032,7 +1041,7 @@ xfs_dir2_data_use_free( 
	 * Look up the entry in the bestfree table.

	 */

	oldlen = be16_to_cpu(dup->length);

	bf = args->dp->d_ops->data_bestfree_p(hdr);

	bf = xfs_dir2_data_bestfree_p(args->dp->i_mount, hdr);

	dfp = xfs_dir2_data_freefind(hdr, bf, dup);

	ASSERT(dfp || oldlen <= be16_to_cpu(bf[2].length));

	/*

fs/xfs/libxfs/xfs_dir2_leaf.c

+6 −5
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ xfs_dir2_block_to_leaf( 
	xfs_dir3_data_check(dp, dbp);

	btp = xfs_dir2_block_tail_p(args->geo, hdr);

	blp = xfs_dir2_block_leaf_p(btp);

	bf = dp->d_ops->data_bestfree_p(hdr);

	bf = xfs_dir2_data_bestfree_p(dp->i_mount, hdr);



	/*

	 * Set the counts in the leaf header.
@@ -823,7 +823,7 @@ xfs_dir2_leaf_addname( 
		else

			xfs_dir3_leaf_log_bests(args, lbp, use_block, use_block);

		hdr = dbp->b_addr;

		bf = dp->d_ops->data_bestfree_p(hdr);

		bf = xfs_dir2_data_bestfree_p(dp->i_mount, hdr);

		bestsp[use_block] = bf[0].length;

		grown = 1;

	} else {
@@ -839,7 +839,7 @@ xfs_dir2_leaf_addname( 
			return error;

		}

		hdr = dbp->b_addr;

		bf = dp->d_ops->data_bestfree_p(hdr);

		bf = xfs_dir2_data_bestfree_p(dp->i_mount, hdr);

		grown = 0;

	}

	/*
@@ -1376,7 +1376,7 @@ xfs_dir2_leaf_removename( 
	leaf = lbp->b_addr;

	hdr = dbp->b_addr;

	xfs_dir3_data_check(dp, dbp);

	bf = dp->d_ops->data_bestfree_p(hdr);

	bf = xfs_dir2_data_bestfree_p(dp->i_mount, hdr);



	/*

	 * Point to the leaf entry, use that to point to the data entry.
@@ -1620,7 +1620,8 @@ xfs_dir2_leaf_trim_data( 
#ifdef DEBUG

{

	struct xfs_dir2_data_hdr *hdr = dbp->b_addr;

	struct xfs_dir2_data_free *bf = dp->d_ops->data_bestfree_p(hdr);

	struct xfs_dir2_data_free *bf =

		xfs_dir2_data_bestfree_p(dp->i_mount, hdr);



	ASSERT(hdr->magic == cpu_to_be32(XFS_DIR2_DATA_MAGIC) ||

	       hdr->magic == cpu_to_be32(XFS_DIR3_DATA_MAGIC));

CRA Git | Maintained and supported by SUSTech CRA and CCSE