Commit f5b999c0 authored by Eric Sandeen's avatar Eric Sandeen Committed by Darrick J. Wong
Browse files

xfs: remove unused flag arguments 



There are several functions which take a flag argument that is
only ever passed as "0," so remove these arguments.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarBill O'Donnell <billodo@redhat.com>
Reviewed-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 76dee769

fs/xfs/libxfs/xfs_ag.c

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ xfs_btroot_init( 
	struct xfs_buf		*bp,

	struct aghdr_init_data	*id)

{

	xfs_btree_init_block(mp, bp, id->type, 0, 0, id->agno, 0);

	xfs_btree_init_block(mp, bp, id->type, 0, 0, id->agno);

}



/*
@@ -67,7 +67,7 @@ xfs_bnoroot_init( 
{

	struct xfs_alloc_rec	*arec;



	xfs_btree_init_block(mp, bp, XFS_BTNUM_BNO, 0, 1, id->agno, 0);

	xfs_btree_init_block(mp, bp, XFS_BTNUM_BNO, 0, 1, id->agno);

	arec = XFS_ALLOC_REC_ADDR(mp, XFS_BUF_TO_BLOCK(bp), 1);

	arec->ar_startblock = cpu_to_be32(mp->m_ag_prealloc_blocks);

	arec->ar_blockcount = cpu_to_be32(id->agsize -
@@ -82,7 +82,7 @@ xfs_cntroot_init( 
{

	struct xfs_alloc_rec	*arec;



	xfs_btree_init_block(mp, bp, XFS_BTNUM_CNT, 0, 1, id->agno, 0);

	xfs_btree_init_block(mp, bp, XFS_BTNUM_CNT, 0, 1, id->agno);

	arec = XFS_ALLOC_REC_ADDR(mp, XFS_BUF_TO_BLOCK(bp), 1);

	arec->ar_startblock = cpu_to_be32(mp->m_ag_prealloc_blocks);

	arec->ar_blockcount = cpu_to_be32(id->agsize -
@@ -101,7 +101,7 @@ xfs_rmaproot_init( 
	struct xfs_btree_block	*block = XFS_BUF_TO_BLOCK(bp);

	struct xfs_rmap_rec	*rrec;



	xfs_btree_init_block(mp, bp, XFS_BTNUM_RMAP, 0, 4, id->agno, 0);

	xfs_btree_init_block(mp, bp, XFS_BTNUM_RMAP, 0, 4, id->agno);



	/*

	 * mark the AG header regions as static metadata The BNO

fs/xfs/libxfs/xfs_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -1627,7 +1627,7 @@ xfs_alloc_ag_vextent_small( 
				xfs_buf_t	*bp;



				bp = xfs_btree_get_bufs(args->mp, args->tp,

					args->agno, fbno, 0);

					args->agno, fbno);

				if (!bp) {

					error = -EFSCORRUPTED;

					goto error0;
@@ -2095,7 +2095,7 @@ xfs_free_agfl_block( 
	if (error)

		return error;



	bp = xfs_btree_get_bufs(tp->t_mountp, tp, agno, agbno, 0);

	bp = xfs_btree_get_bufs(tp->t_mountp, tp, agno, agbno);

	if (!bp)

		return -EFSCORRUPTED;

	xfs_trans_binval(tp, bp);

fs/xfs/libxfs/xfs_attr_remote.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ xfs_attr_rmtval_set( 
		dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock),

		dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount);



		bp = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt, 0);

		bp = xfs_buf_get(mp->m_ddev_targp, dblkno, dblkcnt);

		if (!bp)

			return -ENOMEM;

		bp->b_ops = &xfs_attr3_rmt_buf_ops;

fs/xfs/libxfs/xfs_bmap.c

+7 −7
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ xfs_bmap_check_leaf_extents( 
		bp = xfs_bmap_get_bp(cur, XFS_FSB_TO_DADDR(mp, bno));

		if (!bp) {

			bp_release = 1;

			error = xfs_btree_read_bufl(mp, NULL, bno, 0, &bp,

			error = xfs_btree_read_bufl(mp, NULL, bno, &bp,

						XFS_BMAP_BTREE_REF,

						&xfs_bmbt_buf_ops);

			if (error)
@@ -454,7 +454,7 @@ xfs_bmap_check_leaf_extents( 
		bp = xfs_bmap_get_bp(cur, XFS_FSB_TO_DADDR(mp, bno));

		if (!bp) {

			bp_release = 1;

			error = xfs_btree_read_bufl(mp, NULL, bno, 0, &bp,

			error = xfs_btree_read_bufl(mp, NULL, bno, &bp,

						XFS_BMAP_BTREE_REF,

						&xfs_bmbt_buf_ops);

			if (error)
@@ -619,7 +619,7 @@ xfs_bmap_btree_to_extents( 
	XFS_WANT_CORRUPTED_RETURN(cur->bc_mp,

			xfs_btree_check_lptr(cur, cbno, 1));

#endif

	error = xfs_btree_read_bufl(mp, tp, cbno, 0, &cbp, XFS_BMAP_BTREE_REF,

	error = xfs_btree_read_bufl(mp, tp, cbno, &cbp, XFS_BMAP_BTREE_REF,

				&xfs_bmbt_buf_ops);

	if (error)

		return error;
@@ -732,7 +732,7 @@ xfs_bmap_extents_to_btree( 
	cur->bc_private.b.allocated++;

	ip->i_d.di_nblocks++;

	xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, 1L);

	abp = xfs_btree_get_bufl(mp, tp, args.fsbno, 0);

	abp = xfs_btree_get_bufl(mp, tp, args.fsbno);

	if (!abp) {

		error = -EFSCORRUPTED;

		goto out_unreserve_dquot;
@@ -878,7 +878,7 @@ xfs_bmap_local_to_extents( 
	ASSERT(args.fsbno != NULLFSBLOCK);

	ASSERT(args.len == 1);

	tp->t_firstblock = args.fsbno;

	bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno, 0);

	bp = xfs_btree_get_bufl(args.mp, tp, args.fsbno);



	/*

	 * Initialize the block, copy the data and log the remote buffer.
@@ -1203,7 +1203,7 @@ xfs_iread_extents( 
	 * pointer (leftmost) at each level.

	 */

	while (level-- > 0) {

		error = xfs_btree_read_bufl(mp, tp, bno, 0, &bp,

		error = xfs_btree_read_bufl(mp, tp, bno, &bp,

				XFS_BMAP_BTREE_REF, &xfs_bmbt_buf_ops);

		if (error)

			goto out;
@@ -1276,7 +1276,7 @@ xfs_iread_extents( 
		 */

		if (bno == NULLFSBLOCK)

			break;

		error = xfs_btree_read_bufl(mp, tp, bno, 0, &bp,

		error = xfs_btree_read_bufl(mp, tp, bno, &bp,

				XFS_BMAP_BTREE_REF, &xfs_bmbt_buf_ops);

		if (error)

			goto out;

fs/xfs/libxfs/xfs_btree.c

+11 −19
Original line number Diff line number Diff line
@@ -691,14 +691,13 @@ xfs_buf_t * /* buffer for fsbno */ 
xfs_btree_get_bufl(

	xfs_mount_t	*mp,		/* file system mount point */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_fsblock_t	fsbno,		/* file system block number */

	uint		lock)		/* lock flags for get_buf */

	xfs_fsblock_t	fsbno)		/* file system block number */

{

	xfs_daddr_t		d;		/* real disk block address */



	ASSERT(fsbno != NULLFSBLOCK);

	d = XFS_FSB_TO_DADDR(mp, fsbno);

	return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, lock);

	return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0);

}



/*
@@ -710,15 +709,14 @@ xfs_btree_get_bufs( 
	xfs_mount_t	*mp,		/* file system mount point */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_agnumber_t	agno,		/* allocation group number */

	xfs_agblock_t	agbno,		/* allocation group block number */

	uint		lock)		/* lock flags for get_buf */

	xfs_agblock_t	agbno)		/* allocation group block number */

{

	xfs_daddr_t		d;		/* real disk block address */



	ASSERT(agno != NULLAGNUMBER);

	ASSERT(agbno != NULLAGBLOCK);

	d = XFS_AGB_TO_DADDR(mp, agno, agbno);

	return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, lock);

	return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0);

}



/*
@@ -845,7 +843,6 @@ xfs_btree_read_bufl( 
	struct xfs_mount	*mp,		/* file system mount point */

	struct xfs_trans	*tp,		/* transaction pointer */

	xfs_fsblock_t		fsbno,		/* file system block number */

	uint			lock,		/* lock flags for read_buf */

	struct xfs_buf		**bpp,		/* buffer for fsbno */

	int			refval,		/* ref count value for buffer */

	const struct xfs_buf_ops *ops)
@@ -858,7 +855,7 @@ xfs_btree_read_bufl( 
		return -EFSCORRUPTED;

	d = XFS_FSB_TO_DADDR(mp, fsbno);

	error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, d,

				   mp->m_bsize, lock, &bp, ops);

				   mp->m_bsize, 0, &bp, ops);

	if (error)

		return error;

	if (bp)
@@ -1185,11 +1182,10 @@ xfs_btree_init_block( 
	xfs_btnum_t	btnum,

	__u16		level,

	__u16		numrecs,

	__u64		owner,

	unsigned int	flags)

	__u64		owner)

{

	xfs_btree_init_block_int(mp, XFS_BUF_TO_BLOCK(bp), bp->b_bn,

				 btnum, level, numrecs, owner, flags);

				 btnum, level, numrecs, owner, 0);

}



STATIC void
@@ -1288,7 +1284,6 @@ STATIC int 
xfs_btree_get_buf_block(

	struct xfs_btree_cur	*cur,

	union xfs_btree_ptr	*ptr,

	int			flags,

	struct xfs_btree_block	**block,

	struct xfs_buf		**bpp)

{
@@ -1296,14 +1291,11 @@ xfs_btree_get_buf_block( 
	xfs_daddr_t		d;

	int			error;



	/* need to sort out how callers deal with failures first */

	ASSERT(!(flags & XBF_TRYLOCK));



	error = xfs_btree_ptr_to_daddr(cur, ptr, &d);

	if (error)

		return error;

	*bpp = xfs_trans_get_buf(cur->bc_tp, mp->m_ddev_targp, d,

				 mp->m_bsize, flags);

				 mp->m_bsize, 0);



	if (!*bpp)

		return -ENOMEM;
@@ -2706,7 +2698,7 @@ __xfs_btree_split( 
	XFS_BTREE_STATS_INC(cur, alloc);



	/* Set up the new block as "right". */

	error = xfs_btree_get_buf_block(cur, &rptr, 0, &right, &rbp);

	error = xfs_btree_get_buf_block(cur, &rptr, &right, &rbp);

	if (error)

		goto error0;
@@ -2961,7 +2953,7 @@ xfs_btree_new_iroot( 
	XFS_BTREE_STATS_INC(cur, alloc);



	/* Copy the root into a real block. */

	error = xfs_btree_get_buf_block(cur, &nptr, 0, &cblock, &cbp);

	error = xfs_btree_get_buf_block(cur, &nptr, &cblock, &cbp);

	if (error)

		goto error0;
@@ -3058,7 +3050,7 @@ xfs_btree_new_root( 
	XFS_BTREE_STATS_INC(cur, alloc);



	/* Set up the new block. */

	error = xfs_btree_get_buf_block(cur, &lptr, 0, &new, &nbp);

	error = xfs_btree_get_buf_block(cur, &lptr, &new, &nbp);

	if (error)

		goto error0;