summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_buf.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2021-06-07 04:50:17 +0300
committerDave Chinner <david@fromorbit.com>2021-06-07 04:50:17 +0300
commit289ae7b48c2c4d9bec515e720c01146498109dee (patch)
tree0099b09fcb21b6bac005a1a16687bfe18c64a18a /fs/xfs/xfs_buf.c
parent934d1076bb2c5bbb3d5b0e3892b208d1f537949d (diff)
downloadlinux-289ae7b48c2c4d9bec515e720c01146498109dee.tar.xz
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: Dave Chinner <dchinner@redhat.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Diffstat (limited to 'fs/xfs/xfs_buf.c')
-rw-r--r--fs/xfs/xfs_buf.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 5c6a7140d28d..0b0d66d31515 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -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) {