aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_scan.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2018-11-01 18:36:27 -0400
committerJens Axboe <axboe@kernel.dk>2018-11-07 15:42:32 -0500
commitf664a3cc17b7d0a2bc3b3ab96181e1029b0ec0e6 (patch)
treed49b6866c48f12638ae5e8dcbddf97d0074243e4 /drivers/scsi/scsi_scan.c
parent3a7ea2c483a53fc89e336f69c6ee1d7defe00811 (diff)
scsi: kill off the legacy IO path
This removes the legacy (non-mq) IO path for SCSI. Cc: linux-scsi@vger.kernel.org Acked-by: Himanshu Madhani <himanshu.madhani@cavium.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Tested-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Omar Sandoval <osandov@fb.com> Acked-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r--drivers/scsi/scsi_scan.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 78ca63dfba4a..dd0d516f65e2 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -266,10 +266,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
266 */ 266 */
267 sdev->borken = 1; 267 sdev->borken = 1;
268 268
269 if (shost_use_blk_mq(shost)) 269 sdev->request_queue = scsi_mq_alloc_queue(sdev);
270 sdev->request_queue = scsi_mq_alloc_queue(sdev);
271 else
272 sdev->request_queue = scsi_old_alloc_queue(sdev);
273 if (!sdev->request_queue) { 270 if (!sdev->request_queue) {
274 /* release fn is set up in scsi_sysfs_device_initialise, so 271 /* release fn is set up in scsi_sysfs_device_initialise, so
275 * have to free and put manually here */ 272 * have to free and put manually here */
@@ -280,11 +277,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
280 WARN_ON_ONCE(!blk_get_queue(sdev->request_queue)); 277 WARN_ON_ONCE(!blk_get_queue(sdev->request_queue));
281 sdev->request_queue->queuedata = sdev; 278 sdev->request_queue->queuedata = sdev;
282 279
283 if (!shost_use_blk_mq(sdev->host)) {
284 blk_queue_init_tags(sdev->request_queue,
285 sdev->host->cmd_per_lun, shost->bqt,
286 shost->hostt->tag_alloc_policy);
287 }
288 scsi_change_queue_depth(sdev, sdev->host->cmd_per_lun ? 280 scsi_change_queue_depth(sdev, sdev->host->cmd_per_lun ?
289 sdev->host->cmd_per_lun : 1); 281 sdev->host->cmd_per_lun : 1);
290 282