Commit a5665c3d authored by Daniel Wagner's avatar Daniel Wagner Committed by Jens Axboe
Browse files

virtio: blk/scsi: replace blk_mq_virtio_map_queues with blk_mq_map_hw_queues 



Replace all users of blk_mq_virtio_map_queues with the more generic
blk_mq_map_hw_queues. This in preparation to retire
blk_mq_virtio_map_queues.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Signed-off-by: default avatarDaniel Wagner <wagi@kernel.org>
Link: https://lore.kernel.org/r/20241202-refactor-blk-affinity-helpers-v6-7-27211e9c2cd5@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4425f649

drivers/block/virtio_blk.c

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/string_helpers.h>

#include <linux/idr.h>

#include <linux/blk-mq.h>

#include <linux/blk-mq-virtio.h>

#include <linux/numa.h>

#include <linux/vmalloc.h>

#include <uapi/linux/virtio_ring.h>
@@ -1181,7 +1180,8 @@ static void virtblk_map_queues(struct blk_mq_tag_set *set) 
		if (i == HCTX_TYPE_POLL)

			blk_mq_map_queues(&set->map[i]);

		else

			blk_mq_virtio_map_queues(&set->map[i], vblk->vdev, 0);

			blk_mq_map_hw_queues(&set->map[i],

					     &vblk->vdev->dev, 0);

	}

}

drivers/scsi/virtio_scsi.c

+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <scsi/scsi_tcq.h>

#include <scsi/scsi_devinfo.h>

#include <linux/seqlock.h>

#include <linux/blk-mq-virtio.h>



#include "sd.h"
@@ -746,7 +745,7 @@ static void virtscsi_map_queues(struct Scsi_Host *shost) 
		if (i == HCTX_TYPE_POLL)

			blk_mq_map_queues(map);

		else

			blk_mq_virtio_map_queues(map, vscsi->vdev, 2);

			blk_mq_map_hw_queues(map, &vscsi->vdev->dev, 2);

	}

}