Commit 289ae7b4 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: get rid of xb_to_gfp() 



Only used in one place, so just open code the logic in the macro.
Based on a patch from Christoph Hellwig.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 934d1076

fs/xfs/xfs_buf.c

+6 −4
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 


static kmem_zone_t *xfs_buf_zone;



#define xb_to_gfp(flags) \

	((((flags) & XBF_READ_AHEAD) ? __GFP_NORETRY : GFP_NOFS) | __GFP_NOWARN)



/*

 * Locking orders

 *
@@ -350,9 +347,14 @@ xfs_buf_alloc_pages( 
	struct xfs_buf	*bp,

	xfs_buf_flags_t	flags)

{

	gfp_t		gfp_mask = xb_to_gfp(flags);

	gfp_t		gfp_mask = __GFP_NOWARN;

	long		filled = 0;



	if (flags & XBF_READ_AHEAD)

		gfp_mask |= __GFP_NORETRY;

	else

		gfp_mask |= GFP_NOFS;



	/* Make sure that we have a page list */

	bp->b_page_count = DIV_ROUND_UP(BBTOB(bp->b_length), PAGE_SIZE);

	if (bp->b_page_count <= XB_PAGES) {