Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/block/blk-mq-virtio.c b/block/blk-mq-virtio.c
index c3afbca1129956348389c3e6d26b1402c03fd6c3..37082716383527adce4b11d174034dbaa4b7a595 100644 (file)
--- a/block/blk-mq-virtio.c
+++ b/block/blk-mq-virtio.c
@@ -29,7 +29,7 @@
  * that maps a queue to the CPUs that have irq affinity for the corresponding
  * vector.
  */
-int blk_mq_virtio_map_queues(struct blk_mq_tag_set *set,
+int blk_mq_virtio_map_queues(struct blk_mq_queue_map *qmap,
                struct virtio_device *vdev, int first_vec)
 {
        const struct cpumask *mask;
@@ -38,17 +38,17 @@ int blk_mq_virtio_map_queues(struct blk_mq_tag_set *set,
        if (!vdev->config->get_vq_affinity)
                goto fallback;
 
-       for (queue = 0; queue < set->nr_hw_queues; queue++) {
+       for (queue = 0; queue < qmap->nr_queues; queue++) {
                mask = vdev->config->get_vq_affinity(vdev, first_vec + queue);
                if (!mask)
                        goto fallback;
 
                for_each_cpu(cpu, mask)
-                       set->mq_map[cpu] = queue;
+                       qmap->mq_map[cpu] = qmap->queue_offset + queue;
        }
 
        return 0;
 fallback:
-       return blk_mq_map_queues(set);
+       return blk_mq_map_queues(qmap);
 }
 EXPORT_SYMBOL_GPL(blk_mq_virtio_map_queues);