[PATCH] xfs: remove xfs_trans_get_block_res

[Brian Foster]

On Sat, Feb 13, 2016 at 01:09:41PM +0100, Christoph Hellwig wrote:
> Just use the t_blk_res field directly instead of obsfucating the reference
> by a macro.
> 
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---

Reviewed-by: Brian Foster <bfoster at redhat.com>

>  fs/xfs/libxfs/xfs_bmap.c       | 6 +++---
>  fs/xfs/libxfs/xfs_bmap_btree.c | 4 ++--
>  fs/xfs/xfs_trans.h             | 1 -
>  3 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 3e89e0e..a0fa2f5 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -5707,7 +5707,7 @@ xfs_bunmapi(
>  			 * This is better than zeroing it.
>  			 */
>  			ASSERT(del.br_state == XFS_EXT_NORM);
> -			ASSERT(xfs_trans_get_block_res(tp) > 0);
> +			ASSERT(tp->t_blk_res > 0);
>  			/*
>  			 * If this spans a realtime extent boundary,
>  			 * chop it back to the start of the one we end at.
> @@ -5738,7 +5738,7 @@ xfs_bunmapi(
>  				del.br_startblock += mod;
>  			} else if ((del.br_startoff == start &&
>  				    (del.br_state == XFS_EXT_UNWRITTEN ||
> -				     xfs_trans_get_block_res(tp) == 0)) ||
> +				     tp->t_blk_res == 0)) ||
>  				   !xfs_sb_version_hasextflgbit(&mp->m_sb)) {
>  				/*
>  				 * Can't make it unwritten.  There isn't
> @@ -5829,7 +5829,7 @@ xfs_bunmapi(
>  		 * conversion to btree format, since the transaction
>  		 * will be dirty.
>  		 */
> -		if (!wasdel && xfs_trans_get_block_res(tp) == 0 &&
> +		if (!wasdel && tp->t_blk_res == 0 &&
>  		    XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_EXTENTS &&
>  		    XFS_IFORK_NEXTENTS(ip, whichfork) >= /* Note the >= */
>  			XFS_IFORK_MAXEXT(ip, whichfork) &&
> diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
> index 77a8c63..5dcbfae 100644
> --- a/fs/xfs/libxfs/xfs_bmap_btree.c
> +++ b/fs/xfs/libxfs/xfs_bmap_btree.c
> @@ -464,7 +464,7 @@ try_another_ag:
>  		 * reservation amount is insufficient then we may fail a
>  		 * block allocation here and corrupt the filesystem.
>  		 */
> -		args.minleft = xfs_trans_get_block_res(args.tp);
> +		args.minleft = args.tp->t_blk_res;
>  	} else if (cur->bc_private.b.flist->xbf_low) {
>  		args.type = XFS_ALLOCTYPE_START_BNO;
>  	} else {
> @@ -473,7 +473,7 @@ try_another_ag:
>  
>  	args.minlen = args.maxlen = args.prod = 1;
>  	args.wasdel = cur->bc_private.b.flags & XFS_BTCUR_BPRV_WASDEL;
> -	if (!args.wasdel && xfs_trans_get_block_res(args.tp) == 0) {
> +	if (!args.wasdel && args.tp->t_blk_res == 0) {
>  		error = -ENOSPC;
>  		goto error0;
>  	}
> diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
> index 50fe77e..d49dfef 100644
> --- a/fs/xfs/xfs_trans.h
> +++ b/fs/xfs/xfs_trans.h
> @@ -133,7 +133,6 @@ typedef struct xfs_trans {
>   * XFS transaction mechanism exported interfaces that are
>   * actually macros.
>   */
> -#define	xfs_trans_get_block_res(tp)	((tp)->t_blk_res)
>  #define	xfs_trans_set_sync(tp)		((tp)->t_flags |= XFS_TRANS_SYNC)
>  
>  #if defined(DEBUG) || defined(XFS_WARN)
> -- 
> 2.1.4
> 
> _______________________________________________
> xfs mailing list
> xfs at oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs