leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: get rid of xb_to_gfp()

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

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Dave Chinner
2021-06-07 11:50:17 +10:00
committed by Dave Chinner
parent 934d1076bb
commit 289ae7b48c
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/xfs/xfs_buf.c
View File

@@ -22,9 +22,6 @@
static kmem_zone_t *xfs_buf_zone; static kmem_zone_t *xfs_buf_zone;
#define xb_to_gfp(flags) \
((((flags) & XBF_READ_AHEAD) ? __GFP_NORETRY : GFP_NOFS) | __GFP_NOWARN)
/* /*
* Locking orders * Locking orders
* *
@@ -350,9 +347,14 @@ xfs_buf_alloc_pages(
struct xfs_buf *bp, struct xfs_buf *bp,
xfs_buf_flags_t flags) xfs_buf_flags_t flags)
{ {
gfp_t gfp_mask = xb_to_gfp(flags); gfp_t gfp_mask = __GFP_NOWARN;
long filled = 0; 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 */ /* Make sure that we have a page list */
bp->b_page_count = DIV_ROUND_UP(BBTOB(bp->b_length), PAGE_SIZE); bp->b_page_count = DIV_ROUND_UP(BBTOB(bp->b_length), PAGE_SIZE);
if (bp->b_page_count <= XB_PAGES) { if (bp->b_page_count <= XB_PAGES) {