Skip to content

L
linux
Commit db27edf8 authored by James Bottomley's avatar James Bottomley
Browse files
Options

Merge remote-tracking branch 'mkp-scsi/4.10/scsi-fixes' into fixes

parents 7ce7d89f 7961d53d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/scsi/qedi/Kconfig
View file @ db27edf8
config QEDI config QEDI
tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support" tristate "QLogic QEDI 25/40/100Gb iSCSI Initiator Driver Support"
depends on PCI && SCSI depends on PCI && SCSI && UIO
depends on QED depends on QED
select SCSI_ISCSI_ATTRS select SCSI_ISCSI_ATTRS
select QED_LL2 select QED_LL2
......
drivers/scsi/scsi_lib.c
View file @ db27edf8
...@@ -2893,7 +2893,7 @@ scsi_internal_device_block(struct scsi_device *sdev) ...@@ -2893,7 +2893,7 @@ scsi_internal_device_block(struct scsi_device *sdev)
* request queue. * request queue.
*/ */
if (q->mq_ops) { if (q->mq_ops) {
blk_mq_stop_hw_queues(q); blk_mq_quiesce_queue(q);
} else { } else {
spin_lock_irqsave(q->queue_lock, flags); spin_lock_irqsave(q->queue_lock, flags);
blk_stop_queue(q); blk_stop_queue(q);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7