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

xfs: move the dir2 data block fixed offsets to struct xfs_da_geometry 



Move the data block fixed offsets towards our structure for dir/attr
geometry parameters.

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 7e8ae7bd

fs/xfs/libxfs/xfs_da_btree.h

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ struct xfs_da_geometry { 
	unsigned int	free_hdr_size;	/* dir2 free header size */

	unsigned int	free_max_bests;	/* # of bests entries in dir2 free */

	xfs_dablk_t	freeblk;	/* blockno of free data v2 */



	xfs_dir2_data_aoff_t data_first_offset;

	size_t		data_entry_offset;

};



/*========================================================================

fs/xfs/libxfs/xfs_da_format.c

+0 −15
Original line number Diff line number Diff line
@@ -105,33 +105,18 @@ 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,



	.data_first_offset =  sizeof(struct xfs_dir2_data_hdr) +

				XFS_DIR2_DATA_ENTSIZE(1) +

				XFS_DIR2_DATA_ENTSIZE(2),

	.data_entry_offset = sizeof(struct xfs_dir2_data_hdr),

};



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,



	.data_first_offset =  sizeof(struct xfs_dir2_data_hdr) +

				XFS_DIR3_DATA_ENTSIZE(1) +

				XFS_DIR3_DATA_ENTSIZE(2),

	.data_entry_offset = sizeof(struct xfs_dir2_data_hdr),

};



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,



	.data_first_offset =  sizeof(struct xfs_dir3_data_hdr) +

				XFS_DIR3_DATA_ENTSIZE(1) +

				XFS_DIR3_DATA_ENTSIZE(2),

	.data_entry_offset = sizeof(struct xfs_dir3_data_hdr),

};



/*

fs/xfs/libxfs/xfs_dir2.c

+8 −0
Original line number Diff line number Diff line
@@ -126,16 +126,24 @@ xfs_da_mount( 
		dageo->node_hdr_size = sizeof(struct xfs_da3_node_hdr);

		dageo->leaf_hdr_size = sizeof(struct xfs_dir3_leaf_hdr);

		dageo->free_hdr_size = sizeof(struct xfs_dir3_free_hdr);

		dageo->data_entry_offset =

				sizeof(struct xfs_dir3_data_hdr);

	} else {

		dageo->node_hdr_size = sizeof(struct xfs_da_node_hdr);

		dageo->leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr);

		dageo->free_hdr_size = sizeof(struct xfs_dir2_free_hdr);

		dageo->data_entry_offset =

				sizeof(struct xfs_dir2_data_hdr);

	}

	dageo->leaf_max_ents = (dageo->blksize - dageo->leaf_hdr_size) /

			sizeof(struct xfs_dir2_leaf_entry);

	dageo->free_max_bests = (dageo->blksize - dageo->free_hdr_size) /

			sizeof(xfs_dir2_data_off_t);



	dageo->data_first_offset = dageo->data_entry_offset +

			xfs_dir2_data_entsize(mp, 1) +

			xfs_dir2_data_entsize(mp, 2);



	/*

	 * Now we've set up the block conversion variables, we can calculate the

	 * segment block constants using the geometry structure.

fs/xfs/libxfs/xfs_dir2.h

+0 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ struct xfs_dir_ops { 
				uint8_t ftype);

	struct xfs_dir2_data_free *

		(*data_bestfree_p)(struct xfs_dir2_data_hdr *hdr);



	xfs_dir2_data_aoff_t data_first_offset;

	size_t	data_entry_offset;

};



extern const struct xfs_dir_ops *

fs/xfs/libxfs/xfs_dir2_block.c

+3 −2
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ xfs_dir2_leaf_to_block( 
	while (dp->i_d.di_size > args->geo->blksize) {

		int hdrsz;



		hdrsz = dp->d_ops->data_entry_offset;

		hdrsz = args->geo->data_entry_offset;

		bestsp = xfs_dir2_leaf_bests_p(ltp);

		if (be16_to_cpu(bestsp[be32_to_cpu(ltp->bestcount) - 1]) ==

					    args->geo->blksize - hdrsz) {
@@ -1045,6 +1045,7 @@ xfs_dir2_sf_to_block( 
	struct xfs_inode	*dp = args->dp;

	struct xfs_mount	*mp = dp->i_mount;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(dp, XFS_DATA_FORK);

	struct xfs_da_geometry	*geo = args->geo;

	xfs_dir2_db_t		blkno;		/* dir-relative block # (0) */

	xfs_dir2_data_hdr_t	*hdr;		/* block header */

	xfs_dir2_leaf_entry_t	*blp;		/* block leaf entries */
@@ -1059,7 +1060,7 @@ xfs_dir2_sf_to_block( 
	int			needlog;	/* need to log block header */

	int			needscan;	/* need to scan block freespc */

	int			newoffset;	/* offset from current entry */

	unsigned int		offset = dp->d_ops->data_entry_offset;

	unsigned int		offset = geo->data_entry_offset;

	xfs_dir2_sf_entry_t	*sfep;		/* sf entry pointer */

	xfs_dir2_sf_hdr_t	*oldsfp;	/* old shortform header  */

	xfs_dir2_sf_hdr_t	*sfp;		/* shortform header  */