hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/scsi/scsi_scan.c
....@@ -236,7 +236,6 @@
236236 sdev->sdev_state = SDEV_CREATED;
237237 INIT_LIST_HEAD(&sdev->siblings);
238238 INIT_LIST_HEAD(&sdev->same_target_siblings);
239
- INIT_LIST_HEAD(&sdev->cmd_list);
240239 INIT_LIST_HEAD(&sdev->starved_entry);
241240 INIT_LIST_HEAD(&sdev->event_list);
242241 spin_lock_init(&sdev->list_lock);
....@@ -266,10 +265,7 @@
266265 */
267266 sdev->borken = 1;
268267
269
- if (shost_use_blk_mq(shost))
270
- sdev->request_queue = scsi_mq_alloc_queue(sdev);
271
- else
272
- sdev->request_queue = scsi_old_alloc_queue(sdev);
268
+ sdev->request_queue = scsi_mq_alloc_queue(sdev);
273269 if (!sdev->request_queue) {
274270 /* release fn is set up in scsi_sysfs_device_initialise, so
275271 * have to free and put manually here */
....@@ -280,11 +276,6 @@
280276 WARN_ON_ONCE(!blk_get_queue(sdev->request_queue));
281277 sdev->request_queue->queuedata = sdev;
282278
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
- }
288279 scsi_change_queue_depth(sdev, sdev->host->cmd_per_lun ?
289280 sdev->host->cmd_per_lun : 1);
290281