blk-mq: code clean-up by adding an API to clear set->mq_map

set->mq_map is now currently cleared if something goes wrong when
establishing a queue map in blk-mq-pci.c.  It's also cleared before
updating a queue map in blk_mq_update_queue_map().

This patch provides an API to clear set->mq_map to make it clear.

Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c
index e233996bb76f2f94d1cef4249132144e379e90cd..db644ec624f501ee63f7d90d35412e0dbabf603a 100644 (file)
--- a/block/blk-mq-pci.c
+++ b/block/blk-mq-pci.c
@@ -17,6 +17,8 @@
 #include <linux/pci.h>
 #include <linux/module.h>
 
+#include "blk-mq.h"
+
 /**
  * blk_mq_pci_map_queues - provide a default queue mapping for PCI device
  * @set:       tagset to provide the mapping for
@@ -48,8 +50,7 @@ int blk_mq_pci_map_queues(struct blk_mq_tag_set *set, struct pci_dev *pdev,
 
 fallback:
        WARN_ON_ONCE(set->nr_hw_queues > 1);
-       for_each_possible_cpu(cpu)
-               set->mq_map[cpu] = 0;
+       blk_mq_clear_mq_map(set);
        return 0;
 }
 EXPORT_SYMBOL_GPL(blk_mq_pci_map_queues);

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 7c6ff13171efcc883de2144aa574a3ead1b40274..3cc074ae5c59579c696c5b9e475273af667b4e3a 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2683,7 +2683,6 @@ static int blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set)
 static int blk_mq_update_queue_map(struct blk_mq_tag_set *set)
 {
        if (set->ops->map_queues) {
-               int cpu;
                /*
                 * transport .map_queues is usually done in the following
                 * way:
@@ -2698,8 +2697,7 @@ static int blk_mq_update_queue_map(struct blk_mq_tag_set *set)
                 * killing stale mapping since one CPU may not be mapped
                 * to any hw queue.
                 */
-               for_each_possible_cpu(cpu)
-                       set->mq_map[cpu] = 0;
+               blk_mq_clear_mq_map(set);
 
                return set->ops->map_queues(set);
        } else

diff --git a/block/blk-mq.h b/block/blk-mq.h
index 23659f41bf2c9ea5fc288ca27d9c8fd9d3edddb0..bc2b24735ed413454693aa39a72f0cfc92704b6e 100644 (file)
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -202,4 +202,12 @@ static inline void blk_mq_put_driver_tag(struct request *rq)
        __blk_mq_put_driver_tag(hctx, rq);
 }
 
+static inline void blk_mq_clear_mq_map(struct blk_mq_tag_set *set)
+{
+       int cpu;
+
+       for_each_possible_cpu(cpu)
+               set->mq_map[cpu] = 0;
+}
+
 #endif