p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

blk-mq: use the introduced blk_mq_unquiesce_queue() 

blk_mq_unquiesce_queue() is used for unquiescing the
queue explicitly, so replace blk_mq_start_stopped_hw_queues()
with it.

For the scsi part, this patch takes Bart's suggestion to
switch to block quiesce/unquiesce API completely.

Cc: linux-nvme@lists.infradead.org
Cc: linux-scsi@vger.kernel.org
Cc: dm-devel@redhat.com
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Ming Lei 2017-06-06 23:22:04 +08:00 committed by Jens Axboe
parent e4e739131a
commit f660174e8b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/md/dm-rq.c
View File

@ -71,7 +71,7 @@ static void dm_old_start_queue(struct request_queue *q)
static void dm_mq_start_queue(struct request_queue *q) static void dm_mq_start_queue(struct request_queue *q)
{ {
blk_mq_start_stopped_hw_queues(q, true); blk_mq_unquiesce_queue(q);
blk_mq_kick_requeue_list(q); blk_mq_kick_requeue_list(q);
} }

2
drivers/nvme/host/core.c
View File

@ -2672,7 +2672,7 @@ void nvme_start_queues(struct nvme_ctrl *ctrl)
mutex_lock(&ctrl->namespaces_mutex); mutex_lock(&ctrl->namespaces_mutex);
list_for_each_entry(ns, &ctrl->namespaces, list) { list_for_each_entry(ns, &ctrl->namespaces, list) {
blk_mq_start_stopped_hw_queues(ns->queue, true); blk_mq_unquiesce_queue(ns->queue);
blk_mq_kick_requeue_list(ns->queue); blk_mq_kick_requeue_list(ns->queue);
} }
mutex_unlock(&ctrl->namespaces_mutex); mutex_unlock(&ctrl->namespaces_mutex);

4
drivers/scsi/scsi_lib.c
View File

@ -2962,7 +2962,7 @@ scsi_internal_device_block(struct scsi_device *sdev, bool wait)
if (wait) if (wait)
blk_mq_quiesce_queue(q); blk_mq_quiesce_queue(q);
else else
blk_mq_stop_hw_queues(q); blk_mq_quiesce_queue_nowait(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);
@ -3016,7 +3016,7 @@ scsi_internal_device_unblock(struct scsi_device *sdev,
return -EINVAL; return -EINVAL;
if (q->mq_ops) { if (q->mq_ops) {
blk_mq_start_stopped_hw_queues(q, false); blk_mq_unquiesce_queue(q);
} else { } else {
spin_lock_irqsave(q->queue_lock, flags); spin_lock_irqsave(q->queue_lock, flags);
blk_start_queue(q); blk_start_queue(q);