[PATCHv2 2/2] blk-mq: use BLK_MQ_GFP_FLAGS macro instead

[xiubli]

From: Xiubo Li <xiu...@redhat.com>

There at least 6 places are using the same combined GFP flags,
switch them to one macro instead to make the code get cleaner.

Signed-off-by: Xiubo Li <xiu...@redhat.com>
Reviewed-by: Ming Lei <ming....@redhat.com>
---
 block/blk-mq.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 9c52e4dfe132..a5faad4690cf 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -39,6 +39,8 @@
 #include "blk-mq-sched.h"
 #include "blk-rq-qos.h"
 
+#define BLK_MQ_GFP_FLAGS (GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY)
+
 static void blk_mq_poll_stats_start(struct request_queue *q);
 static void blk_mq_poll_stats_fn(struct blk_stat_callback *cb);
 
@@ -2091,21 +2093,19 @@ struct blk_mq_tags *blk_mq_alloc_rq_map(struct 
blk_mq_tag_set *set,
 
        tags = blk_mq_init_tags(nr_tags, reserved_tags, node,
                                BLK_MQ_FLAG_TO_ALLOC_POLICY(set->flags),
-                               GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY);
+                               BLK_MQ_GFP_FLAGS);
        if (!tags)
                return NULL;
 
        tags->rqs = kcalloc_node(nr_tags, sizeof(struct request *),
-                                GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY,
-                                node);
+                                BLK_MQ_GFP_FLAGS, node);
        if (!tags->rqs) {
                blk_mq_free_tags(tags);
                return NULL;
        }
 
        tags->static_rqs = kcalloc_node(nr_tags, sizeof(struct request *),
-                                       GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY,
-                                       node);
+                                       BLK_MQ_GFP_FLAGS, node);
        if (!tags->static_rqs) {
                kfree(tags->rqs);
                blk_mq_free_tags(tags);
@@ -2167,7 +2167,7 @@ int blk_mq_alloc_rqs(struct blk_mq_tag_set *set, struct 
blk_mq_tags *tags,
 
                do {
                        page = alloc_pages_node(node,
-                               GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY | 
__GFP_ZERO,
+                               BLK_MQ_GFP_FLAGS | __GFP_ZERO,
                                this_order);
                        if (page)
                                break;
@@ -2333,7 +2333,7 @@ blk_mq_alloc_hctx(struct request_queue *q, struct 
blk_mq_tag_set *set,
                int node)
 {
        struct blk_mq_hw_ctx *hctx;
-       gfp_t gfp = GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY;
+       gfp_t gfp = BLK_MQ_GFP_FLAGS;
 
        hctx = kzalloc_node(blk_mq_hw_ctx_size(set), gfp, node);
        if (!hctx)
@@ -3194,7 +3194,7 @@ static bool blk_mq_elv_switch_none(struct list_head *head,
        if (!q->elevator)
                return true;
 
-       qe = kmalloc(sizeof(*qe), GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY);
+       qe = kmalloc(sizeof(*qe), BLK_MQ_GFP_FLAGS);
        if (!qe)
                return false;
 
-- 
2.21.0