Commit e8222613 authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: remove xfs_buf_t typedef 



Prepare for kernel xfs_buf  alignment by getting rid of the
xfs_buf_t typedef from userspace.

[darrick: This patch is a port of a userspace patch removing the
xfs_buf_t typedef in preparation to make the userspace xfs_buf code
behave more like its kernel counterpart.]

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 1189686e

fs/xfs/libxfs/xfs_alloc.c

+8 −8
Original line number Diff line number Diff line
@@ -690,9 +690,9 @@ xfs_alloc_read_agfl( 
	xfs_mount_t	*mp,		/* mount point structure */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_agnumber_t	agno,		/* allocation group number */

	xfs_buf_t	**bpp)		/* buffer for the ag free block array */

	struct xfs_buf	**bpp)		/* buffer for the ag free block array */

{

	xfs_buf_t	*bp;		/* return value */

	struct xfs_buf	*bp;		/* return value */

	int		error;



	ASSERT(agno != NULLAGNUMBER);
@@ -2647,12 +2647,12 @@ xfs_alloc_fix_freelist( 
int				/* error */

xfs_alloc_get_freelist(

	xfs_trans_t	*tp,	/* transaction pointer */

	xfs_buf_t	*agbp,	/* buffer containing the agf structure */

	struct xfs_buf	*agbp,	/* buffer containing the agf structure */

	xfs_agblock_t	*bnop,	/* block address retrieved from freelist */

	int		btreeblk) /* destination is a AGF btree */

{

	struct xfs_agf	*agf = agbp->b_addr;

	xfs_buf_t	*agflbp;/* buffer for a.g. freelist structure */

	struct xfs_buf	*agflbp;/* buffer for a.g. freelist structure */

	xfs_agblock_t	bno;	/* block number returned */

	__be32		*agfl_bno;

	int		error;
@@ -2711,7 +2711,7 @@ xfs_alloc_get_freelist( 
void

xfs_alloc_log_agf(

	xfs_trans_t	*tp,	/* transaction pointer */

	xfs_buf_t	*bp,	/* buffer for a.g. freelist header */

	struct xfs_buf	*bp,	/* buffer for a.g. freelist header */

	int		fields)	/* mask of fields to be logged (XFS_AGF_...) */

{

	int	first;		/* first byte offset */
@@ -2757,7 +2757,7 @@ xfs_alloc_pagf_init( 
	xfs_agnumber_t		agno,	/* allocation group number */

	int			flags)	/* XFS_ALLOC_FLAGS_... */

{

	xfs_buf_t		*bp;

	struct xfs_buf		*bp;

	int			error;



	error = xfs_alloc_read_agf(mp, tp, agno, flags, &bp);
@@ -2772,8 +2772,8 @@ xfs_alloc_pagf_init( 
int					/* error */

xfs_alloc_put_freelist(

	xfs_trans_t		*tp,	/* transaction pointer */

	xfs_buf_t		*agbp,	/* buffer for a.g. freelist header */

	xfs_buf_t		*agflbp,/* buffer for a.g. free block array */

	struct xfs_buf		*agbp,	/* buffer for a.g. freelist header */

	struct xfs_buf		*agflbp,/* buffer for a.g. free block array */

	xfs_agblock_t		bno,	/* block being freed */

	int			btreeblk) /* block came from a AGF btree */

{

fs/xfs/libxfs/xfs_bmap.c

+3 −3
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ xfs_bmap_check_leaf_extents( 
	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_btree_block	*block;	/* current btree block */

	xfs_fsblock_t		bno;	/* block # of "block" */

	xfs_buf_t		*bp;	/* buffer for "block" */

	struct xfs_buf		*bp;	/* buffer for "block" */

	int			error;	/* error return value */

	xfs_extnum_t		i=0, j;	/* index into the extents list */

	int			level;	/* btree level, for checking */
@@ -592,7 +592,7 @@ xfs_bmap_btree_to_extents( 
	struct xfs_btree_block	*rblock = ifp->if_broot;

	struct xfs_btree_block	*cblock;/* child btree block */

	xfs_fsblock_t		cbno;	/* child block number */

	xfs_buf_t		*cbp;	/* child block's buffer */

	struct xfs_buf		*cbp;	/* child block's buffer */

	int			error;	/* error return value */

	__be64			*pp;	/* ptr to block address */

	struct xfs_owner_info	oinfo;
@@ -830,7 +830,7 @@ xfs_bmap_local_to_extents( 
	int		flags;		/* logging flags returned */

	struct xfs_ifork *ifp;		/* inode fork pointer */

	xfs_alloc_arg_t	args;		/* allocation arguments */

	xfs_buf_t	*bp;		/* buffer for extent block */

	struct xfs_buf	*bp;		/* buffer for extent block */

	struct xfs_bmbt_irec rec;

	struct xfs_iext_cursor icur;

fs/xfs/libxfs/xfs_btree.c

+5 −5
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ xfs_btree_dup_cursor( 
	xfs_btree_cur_t	*cur,		/* input cursor */

	xfs_btree_cur_t	**ncur)		/* output cursor */

{

	xfs_buf_t	*bp;		/* btree block's buffer pointer */

	struct xfs_buf	*bp;		/* btree block's buffer pointer */

	int		error;		/* error return value */

	int		i;		/* level number of btree block */

	xfs_mount_t	*mp;		/* mount structure for filesystem */
@@ -701,7 +701,7 @@ xfs_btree_firstrec( 
	int			level)	/* level to change */

{

	struct xfs_btree_block	*block;	/* generic btree block pointer */

	xfs_buf_t		*bp;	/* buffer containing block */

	struct xfs_buf		*bp;	/* buffer containing block */



	/*

	 * Get the block pointer for this level.
@@ -731,7 +731,7 @@ xfs_btree_lastrec( 
	int			level)	/* level to change */

{

	struct xfs_btree_block	*block;	/* generic btree block pointer */

	xfs_buf_t		*bp;	/* buffer containing block */

	struct xfs_buf		*bp;	/* buffer containing block */



	/*

	 * Get the block pointer for this level.
@@ -993,7 +993,7 @@ STATIC void 
xfs_btree_setbuf(

	xfs_btree_cur_t		*cur,	/* btree cursor */

	int			lev,	/* level in btree */

	xfs_buf_t		*bp)	/* new buffer to set */

	struct xfs_buf		*bp)	/* new buffer to set */

{

	struct xfs_btree_block	*b;	/* btree block */
@@ -1636,7 +1636,7 @@ xfs_btree_decrement( 
	int			*stat)		/* success/failure */

{

	struct xfs_btree_block	*block;

	xfs_buf_t		*bp;

	struct xfs_buf		*bp;

	int			error;		/* error return value */

	int			lev;

	union xfs_btree_ptr	ptr;

fs/xfs/libxfs/xfs_ialloc.c

+2 −2
Original line number Diff line number Diff line
@@ -2459,7 +2459,7 @@ xfs_imap( 
void

xfs_ialloc_log_agi(

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_buf_t	*bp,		/* allocation group header buffer */

	struct xfs_buf	*bp,		/* allocation group header buffer */

	int		fields)		/* bitmask of fields to log */

{

	int			first;		/* first byte number */
@@ -2680,7 +2680,7 @@ xfs_ialloc_pagi_init( 
	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_agnumber_t	agno)		/* allocation group number */

{

	xfs_buf_t	*bp = NULL;

	struct xfs_buf	*bp = NULL;

	int		error;



	error = xfs_ialloc_read_agi(mp, tp, agno, &bp);

fs/xfs/libxfs/xfs_rtbitmap.c

+11 −11
Original line number Diff line number Diff line
@@ -56,9 +56,9 @@ xfs_rtbuf_get( 
	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_rtblock_t	block,		/* block number in bitmap or summary */

	int		issum,		/* is summary not bitmap */

	xfs_buf_t	**bpp)		/* output: buffer for the block */

	struct xfs_buf	**bpp)		/* output: buffer for the block */

{

	xfs_buf_t	*bp;		/* block buffer, result */

	struct xfs_buf	*bp;		/* block buffer, result */

	xfs_inode_t	*ip;		/* bitmap or summary inode */

	xfs_bmbt_irec_t	map;

	int		nmap = 1;
@@ -101,7 +101,7 @@ xfs_rtfind_back( 
	xfs_rtword_t	*b;		/* current word in buffer */

	int		bit;		/* bit number in the word */

	xfs_rtblock_t	block;		/* bitmap block number */

	xfs_buf_t	*bp;		/* buf for the block */

	struct xfs_buf	*bp;		/* buf for the block */

	xfs_rtword_t	*bufp;		/* starting word in buffer */

	int		error;		/* error value */

	xfs_rtblock_t	firstbit;	/* first useful bit in the word */
@@ -276,7 +276,7 @@ xfs_rtfind_forw( 
	xfs_rtword_t	*b;		/* current word in buffer */

	int		bit;		/* bit number in the word */

	xfs_rtblock_t	block;		/* bitmap block number */

	xfs_buf_t	*bp;		/* buf for the block */

	struct xfs_buf	*bp;		/* buf for the block */

	xfs_rtword_t	*bufp;		/* starting word in buffer */

	int		error;		/* error value */

	xfs_rtblock_t	i;		/* current bit number rel. to start */
@@ -447,11 +447,11 @@ xfs_rtmodify_summary_int( 
	int		log,		/* log2 of extent size */

	xfs_rtblock_t	bbno,		/* bitmap block number */

	int		delta,		/* change to make to summary info */

	xfs_buf_t	**rbpp,		/* in/out: summary block buffer */

	struct xfs_buf	**rbpp,		/* in/out: summary block buffer */

	xfs_fsblock_t	*rsb,		/* in/out: summary block number */

	xfs_suminfo_t	*sum)		/* out: summary info for this block */

{

	xfs_buf_t	*bp;		/* buffer for the summary block */

	struct xfs_buf	*bp;		/* buffer for the summary block */

	int		error;		/* error value */

	xfs_fsblock_t	sb;		/* summary fsblock */

	int		so;		/* index into the summary file */
@@ -517,7 +517,7 @@ xfs_rtmodify_summary( 
	int		log,		/* log2 of extent size */

	xfs_rtblock_t	bbno,		/* bitmap block number */

	int		delta,		/* change to make to summary info */

	xfs_buf_t	**rbpp,		/* in/out: summary block buffer */

	struct xfs_buf	**rbpp,		/* in/out: summary block buffer */

	xfs_fsblock_t	*rsb)		/* in/out: summary block number */

{

	return xfs_rtmodify_summary_int(mp, tp, log, bbno,
@@ -539,7 +539,7 @@ xfs_rtmodify_range( 
	xfs_rtword_t	*b;		/* current word in buffer */

	int		bit;		/* bit number in the word */

	xfs_rtblock_t	block;		/* bitmap block number */

	xfs_buf_t	*bp;		/* buf for the block */

	struct xfs_buf	*bp;		/* buf for the block */

	xfs_rtword_t	*bufp;		/* starting word in buffer */

	int		error;		/* error value */

	xfs_rtword_t	*first;		/* first used word in the buffer */
@@ -690,7 +690,7 @@ xfs_rtfree_range( 
	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_rtblock_t	start,		/* starting block to free */

	xfs_extlen_t	len,		/* length to free */

	xfs_buf_t	**rbpp,		/* in/out: summary block buffer */

	struct xfs_buf	**rbpp,		/* in/out: summary block buffer */

	xfs_fsblock_t	*rsb)		/* in/out: summary block number */

{

	xfs_rtblock_t	end;		/* end of the freed extent */
@@ -773,7 +773,7 @@ xfs_rtcheck_range( 
	xfs_rtword_t	*b;		/* current word in buffer */

	int		bit;		/* bit number in the word */

	xfs_rtblock_t	block;		/* bitmap block number */

	xfs_buf_t	*bp;		/* buf for the block */

	struct xfs_buf	*bp;		/* buf for the block */

	xfs_rtword_t	*bufp;		/* starting word in buffer */

	int		error;		/* error value */

	xfs_rtblock_t	i;		/* current bit number rel. to start */
@@ -969,7 +969,7 @@ xfs_rtfree_extent( 
	int		error;		/* error value */

	xfs_mount_t	*mp;		/* file system mount structure */

	xfs_fsblock_t	sb;		/* summary file block number */

	xfs_buf_t	*sumbp = NULL;	/* summary file block buffer */

	struct xfs_buf	*sumbp = NULL;	/* summary file block buffer */



	mp = tp->t_mountp;