Skip to content

Commit

Permalink
blk-mq: use the introduced blk_mq_unquiesce_queue()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ming Lei authored and Jens Axboe committed Jun 18, 2017
1 parent e4e7391 commit f660174
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/md/dm-rq.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static void dm_old_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);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/nvme/host/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2672,7 +2672,7 @@ void nvme_start_queues(struct nvme_ctrl *ctrl)

mutex_lock(&ctrl->namespaces_mutex);
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);
}
mutex_unlock(&ctrl->namespaces_mutex);
Expand Down
4 changes: 2 additions & 2 deletions drivers/scsi/scsi_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -2962,7 +2962,7 @@ scsi_internal_device_block(struct scsi_device *sdev, bool wait)
if (wait)
blk_mq_quiesce_queue(q);
else
blk_mq_stop_hw_queues(q);
blk_mq_quiesce_queue_nowait(q);
} else {
spin_lock_irqsave(q->queue_lock, flags);
blk_stop_queue(q);
Expand Down Expand Up @@ -3016,7 +3016,7 @@ scsi_internal_device_unblock(struct scsi_device *sdev,
return -EINVAL;

if (q->mq_ops) {
blk_mq_start_stopped_hw_queues(q, false);
blk_mq_unquiesce_queue(q);
} else {
spin_lock_irqsave(q->queue_lock, flags);
blk_start_queue(q);
Expand Down

0 comments on commit f660174

Please sign in to comment.