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

xfs: move the max dir2 leaf entries count to struct xfs_da_geometry 



Move the max leaf entries count 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 545910bc

fs/xfs/libxfs/xfs_da_btree.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ struct xfs_da_geometry { 
	unsigned int	magicpct;	/* 37% of block size in bytes */

	xfs_dablk_t	datablk;	/* blockno of dir data v2 */

	unsigned int	leaf_hdr_size;	/* dir2 leaf header size */

	unsigned int	leaf_max_ents;	/* # of entries in dir2 leaf */

	xfs_dablk_t	leafblk;	/* blockno of leaf data v2 */

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

};

fs/xfs/libxfs/xfs_da_format.c

+0 −23
Original line number Diff line number Diff line
@@ -401,23 +401,6 @@ xfs_dir3_data_unused_p(struct xfs_dir2_data_hdr *hdr) 
}





/*

 * Directory Leaf block operations

 */

static int

xfs_dir2_max_leaf_ents(struct xfs_da_geometry *geo)

{

	return (geo->blksize - sizeof(struct xfs_dir2_leaf_hdr)) /

		(uint)sizeof(struct xfs_dir2_leaf_entry);

}



static int

xfs_dir3_max_leaf_ents(struct xfs_da_geometry *geo)

{

	return (geo->blksize - sizeof(struct xfs_dir3_leaf_hdr)) /

		(uint)sizeof(struct xfs_dir2_leaf_entry);

}



/*

 * Directory free space block operations

 */
@@ -570,8 +553,6 @@ static const struct xfs_dir_ops xfs_dir2_ops = { 
	.data_entry_p = xfs_dir2_data_entry_p,

	.data_unused_p = xfs_dir2_data_unused_p,



	.leaf_max_ents = xfs_dir2_max_leaf_ents,



	.free_hdr_size = sizeof(struct xfs_dir2_free_hdr),

	.free_hdr_to_disk = xfs_dir2_free_hdr_to_disk,

	.free_hdr_from_disk = xfs_dir2_free_hdr_from_disk,
@@ -611,8 +592,6 @@ static const struct xfs_dir_ops xfs_dir2_ftype_ops = { 
	.data_entry_p = xfs_dir2_data_entry_p,

	.data_unused_p = xfs_dir2_data_unused_p,



	.leaf_max_ents = xfs_dir2_max_leaf_ents,



	.free_hdr_size = sizeof(struct xfs_dir2_free_hdr),

	.free_hdr_to_disk = xfs_dir2_free_hdr_to_disk,

	.free_hdr_from_disk = xfs_dir2_free_hdr_from_disk,
@@ -652,8 +631,6 @@ static const struct xfs_dir_ops xfs_dir3_ops = { 
	.data_entry_p = xfs_dir3_data_entry_p,

	.data_unused_p = xfs_dir3_data_unused_p,



	.leaf_max_ents = xfs_dir3_max_leaf_ents,



	.free_hdr_size = sizeof(struct xfs_dir3_free_hdr),

	.free_hdr_to_disk = xfs_dir3_free_hdr_to_disk,

	.free_hdr_from_disk = xfs_dir3_free_hdr_from_disk,

fs/xfs/libxfs/xfs_dir2.c

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ xfs_da_mount( 
		dageo->node_hdr_size = sizeof(struct xfs_da_node_hdr);

		dageo->leaf_hdr_size = sizeof(struct xfs_dir2_leaf_hdr);

	}

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

			sizeof(struct xfs_dir2_leaf_entry);



	/*

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

fs/xfs/libxfs/xfs_dir2.h

+0 −2
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ struct xfs_dir_ops { 
	struct xfs_dir2_data_unused *

		(*data_unused_p)(struct xfs_dir2_data_hdr *hdr);



	int	(*leaf_max_ents)(struct xfs_da_geometry *geo);



	int	free_hdr_size;

	void	(*free_hdr_to_disk)(struct xfs_dir2_free *to,

				    struct xfs_dir3_icfree_hdr *from);

fs/xfs/libxfs/xfs_dir2_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ xfs_dir3_leaf_check_int( 
	 * Should factor in the size of the bests table as well.

	 * We can deduce a value for that from di_size.

	 */

	if (hdr->count > ops->leaf_max_ents(geo))

	if (hdr->count > geo->leaf_max_ents)

		return __this_address;



	/* Leaves and bests don't overlap in leaf format. */