Commit 66e3237e authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: const-ify xfs_owner_info arguments 



Only certain functions actually change the contents of an
xfs_owner_info; the rest can accept a const struct pointer.  This will
enable us to save stack space by hoisting static owner info types to
be const global variables.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 02b100fb

fs/xfs/libxfs/xfs_alloc.c

+34 −34
Original line number Diff line number Diff line
@@ -1694,28 +1694,28 @@ xfs_alloc_ag_vextent_small( 
 */

STATIC int

xfs_free_ag_extent(

	xfs_trans_t		*tp,

	xfs_buf_t		*agbp,

	struct xfs_trans		*tp,

	struct xfs_buf			*agbp,

	xfs_agnumber_t			agno,

	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	struct xfs_owner_info	*oinfo,

	const struct xfs_owner_info	*oinfo,

	enum xfs_ag_resv_type		type)

{

	xfs_btree_cur_t	*bno_cur;	/* cursor for by-block btree */

	xfs_btree_cur_t	*cnt_cur;	/* cursor for by-size btree */

	int		error;		/* error return value */

	xfs_agblock_t	gtbno;		/* start of right neighbor block */

	xfs_extlen_t	gtlen;		/* length of right neighbor block */

	int		haveleft;	/* have a left neighbor block */

	int		haveright;	/* have a right neighbor block */

	int		i;		/* temp, result code */

	xfs_agblock_t	ltbno;		/* start of left neighbor block */

	xfs_extlen_t	ltlen;		/* length of left neighbor block */

	xfs_mount_t	*mp;		/* mount point struct for filesystem */

	xfs_agblock_t	nbno;		/* new starting block of freespace */

	struct xfs_mount		*mp;

	struct xfs_perag		*pag;

	struct xfs_btree_cur		*bno_cur;

	struct xfs_btree_cur		*cnt_cur;

	xfs_agblock_t			gtbno; /* start of right neighbor */

	xfs_extlen_t			gtlen; /* length of right neighbor */

	xfs_agblock_t			ltbno; /* start of left neighbor */

	xfs_extlen_t			ltlen; /* length of left neighbor */

	xfs_agblock_t			nbno; /* new starting block of freesp */

	xfs_extlen_t			nlen; /* new length of freespace */

	xfs_perag_t	*pag;		/* per allocation group data */

	int				haveleft; /* have a left neighbor */

	int				haveright; /* have a right neighbor */

	int				i;

	int				error;



	bno_cur = cnt_cur = NULL;

	mp = tp->t_mountp;
@@ -3008,13 +3008,13 @@ xfs_free_extent_fix_freelist( 
 * Just break up the extent address and hand off to xfs_free_ag_extent

 * after fixing up the freelist.

 */

int				/* error */

int

__xfs_free_extent(

	struct xfs_trans	*tp,	/* transaction pointer */

	xfs_fsblock_t		bno,	/* starting block number of extent */

	xfs_extlen_t		len,	/* length of extent */

	struct xfs_owner_info	*oinfo,	/* extent owner */

	enum xfs_ag_resv_type	type,	/* block reservation type */

	struct xfs_trans		*tp,

	xfs_fsblock_t			bno,

	xfs_extlen_t			len,

	const struct xfs_owner_info	*oinfo,

	enum xfs_ag_resv_type		type,

	bool				skip_discard)

{

	struct xfs_mount		*mp = tp->t_mountp;

fs/xfs/libxfs/xfs_alloc.h

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ __xfs_free_extent( 
	struct xfs_trans	*tp,	/* transaction pointer */

	xfs_fsblock_t		bno,	/* starting block number of extent */

	xfs_extlen_t		len,	/* length of extent */

	struct xfs_owner_info	*oinfo,	/* extent owner */

	const struct xfs_owner_info	*oinfo,	/* extent owner */

	enum xfs_ag_resv_type	type,	/* block reservation type */

	bool			skip_discard);
@@ -191,7 +191,7 @@ xfs_free_extent( 
	struct xfs_trans	*tp,

	xfs_fsblock_t		bno,

	xfs_extlen_t		len,

	struct xfs_owner_info	*oinfo,

	const struct xfs_owner_info	*oinfo,

	enum xfs_ag_resv_type	type)

{

	return __xfs_free_extent(tp, bno, len, oinfo, type, false);

fs/xfs/libxfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ __xfs_bmap_add_free( 
	struct xfs_trans		*tp,

	xfs_fsblock_t			bno,

	xfs_filblks_t			len,

	struct xfs_owner_info		*oinfo,

	const struct xfs_owner_info	*oinfo,

	bool				skip_discard)

{

	struct xfs_extent_free_item	*new;		/* new element */

fs/xfs/libxfs/xfs_bmap.h

+2 −2
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ int xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd); 
int	xfs_bmap_set_attrforkoff(struct xfs_inode *ip, int size, int *version);

void	xfs_bmap_local_to_extents_empty(struct xfs_inode *ip, int whichfork);

void	__xfs_bmap_add_free(struct xfs_trans *tp, xfs_fsblock_t bno,

		xfs_filblks_t len, struct xfs_owner_info *oinfo,

		xfs_filblks_t len, const struct xfs_owner_info *oinfo,

		bool skip_discard);

void	xfs_bmap_compute_maxlevels(struct xfs_mount *mp, int whichfork);

int	xfs_bmap_first_unused(struct xfs_trans *tp, struct xfs_inode *ip,
@@ -234,7 +234,7 @@ xfs_bmap_add_free( 
	struct xfs_trans		*tp,

	xfs_fsblock_t			bno,

	xfs_filblks_t			len,

	struct xfs_owner_info		*oinfo)

	const struct xfs_owner_info	*oinfo)

{

	__xfs_bmap_add_free(tp, bno, len, oinfo, false);

}

fs/xfs/libxfs/xfs_rmap.c

+106 −106
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ xfs_rmap_unmap( 
	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	bool				unwritten,

	struct xfs_owner_info	*oinfo)

	const struct xfs_owner_info	*oinfo)

{

	struct xfs_mount		*mp = cur->bc_mp;

	struct xfs_rmap_irec		ltrec;
@@ -658,7 +658,7 @@ xfs_rmap_free( 
	xfs_agnumber_t			agno,

	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	struct xfs_owner_info	*oinfo)

	const struct xfs_owner_info	*oinfo)

{

	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_btree_cur		*cur;
@@ -714,7 +714,7 @@ xfs_rmap_map( 
	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	bool				unwritten,

	struct xfs_owner_info	*oinfo)

	const struct xfs_owner_info	*oinfo)

{

	struct xfs_mount		*mp = cur->bc_mp;

	struct xfs_rmap_irec		ltrec;
@@ -895,7 +895,7 @@ xfs_rmap_alloc( 
	xfs_agnumber_t			agno,

	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	struct xfs_owner_info	*oinfo)

	const struct xfs_owner_info	*oinfo)

{

	struct xfs_mount		*mp = tp->t_mountp;

	struct xfs_btree_cur		*cur;
@@ -933,12 +933,12 @@ xfs_rmap_convert( 
	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	bool				unwritten,

	struct xfs_owner_info	*oinfo)

	const struct xfs_owner_info	*oinfo)

{

	struct xfs_mount		*mp = cur->bc_mp;

	struct xfs_rmap_irec		r[4];	/* neighbor extent entries */

					/* left is 0, right is 1, prev is 2 */

					/* new is 3 */

						/* left is 0, right is 1, */

						/* prev is 2, new is 3 */

	uint64_t		owner;

	uint64_t		offset;

	uint64_t		new_endoff;
@@ -1358,12 +1358,12 @@ xfs_rmap_convert_shared( 
	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	bool				unwritten,

	struct xfs_owner_info	*oinfo)

	const struct xfs_owner_info	*oinfo)

{

	struct xfs_mount		*mp = cur->bc_mp;

	struct xfs_rmap_irec		r[4];	/* neighbor extent entries */

					/* left is 0, right is 1, prev is 2 */

					/* new is 3 */

						/* left is 0, right is 1, */

						/* prev is 2, new is 3 */

	uint64_t		owner;

	uint64_t		offset;

	uint64_t		new_endoff;
@@ -1747,7 +1747,7 @@ xfs_rmap_unmap_shared( 
	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	bool				unwritten,

	struct xfs_owner_info	*oinfo)

	const struct xfs_owner_info	*oinfo)

{

	struct xfs_mount		*mp = cur->bc_mp;

	struct xfs_rmap_irec		ltrec;
@@ -1909,7 +1909,7 @@ xfs_rmap_map_shared( 
	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	bool				unwritten,

	struct xfs_owner_info	*oinfo)

	const struct xfs_owner_info	*oinfo)

{

	struct xfs_mount		*mp = cur->bc_mp;

	struct xfs_rmap_irec		ltrec;
@@ -2462,7 +2462,7 @@ xfs_rmap_record_exists( 
	struct xfs_btree_cur		*cur,

	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	struct xfs_owner_info	*oinfo,

	const struct xfs_owner_info	*oinfo,

	bool				*has_rmap)

{

	uint64_t			owner;
@@ -2530,7 +2530,7 @@ xfs_rmap_has_other_keys( 
	struct xfs_btree_cur		*cur,

	xfs_agblock_t			bno,

	xfs_extlen_t			len,

	struct xfs_owner_info		*oinfo,

	const struct xfs_owner_info	*oinfo,

	bool				*has_rmap)

{

	struct xfs_rmap_irec		low = {0};