Merge tag 'pinctrl-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux.git] / block / blk-mq-rdma.c

diff --git a/block/blk-mq-rdma.c b/block/blk-mq-rdma.c
index a71576aff3a59337b69ddd42c317ed6b6dcd07a7..45030a81a1ed901260feb1bb197b91f2d38c12c4 100644 (file)
--- a/block/blk-mq-rdma.c
+++ b/block/blk-mq-rdma.c
@@ -29,24 +29,24 @@
  * @set->nr_hw_queues, or @dev does not provide an affinity mask for a
  * vector, we fallback to the naive mapping.
  */
-int blk_mq_rdma_map_queues(struct blk_mq_tag_set *set,
+int blk_mq_rdma_map_queues(struct blk_mq_queue_map *map,
                struct ib_device *dev, int first_vec)
 {
        const struct cpumask *mask;
        unsigned int queue, cpu;
 
-       for (queue = 0; queue < set->nr_hw_queues; queue++) {
+       for (queue = 0; queue < map->nr_queues; queue++) {
                mask = ib_get_vector_affinity(dev, first_vec + queue);
                if (!mask)
                        goto fallback;
 
                for_each_cpu(cpu, mask)
-                       set->map[0].mq_map[cpu] = queue;
+                       map->mq_map[cpu] = map->queue_offset + queue;
        }
 
        return 0;
 
 fallback:
-       return blk_mq_map_queues(&set->map[0]);
+       return blk_mq_map_queues(map);
 }
 EXPORT_SYMBOL_GPL(blk_mq_rdma_map_queues);