[PATCH 4/8] blk-mq: pass a tagset to blk_mq_wait_quiesce_done

[Chao Leng]

Reviewed-by: Chao Leng <lengchao at huawei.com>

On 2022/10/20 18:56, Christoph Hellwig wrote:
> Noting in blk_mq_wait_quiesce_done needs the request_queue now, so just
> pass the tagset, and move the non-mq check into the only caller that
> needs it.
> 
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
>   block/blk-mq.c           | 10 +++++-----
>   drivers/nvme/host/core.c |  4 ++--
>   drivers/scsi/scsi_lib.c  |  2 +-
>   include/linux/blk-mq.h   |  2 +-
>   4 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 4a81a2da43328..cf8f9f9a96c35 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -254,15 +254,15 @@ EXPORT_SYMBOL_GPL(blk_mq_quiesce_queue_nowait);
>   
>   /**
>    * blk_mq_wait_quiesce_done() - wait until in-progress quiesce is done
> - * @q: request queue.
> + * @set: tag_set to wait on
>    *
>    * Note: it is driver's responsibility for making sure that quiesce has
>    * been started.
>    */
> -void blk_mq_wait_quiesce_done(struct request_queue *q)
> +void blk_mq_wait_quiesce_done(struct blk_mq_tag_set *set)
>   {
> -	if (q->tag_set->flags & BLK_MQ_F_BLOCKING)
> -		synchronize_srcu(&q->tag_set->srcu);
> +	if (set->flags & BLK_MQ_F_BLOCKING)
> +		synchronize_srcu(&set->srcu);
>   	else
>   		synchronize_rcu();
>   }
> @@ -282,7 +282,7 @@ void blk_mq_quiesce_queue(struct request_queue *q)
>   	blk_mq_quiesce_queue_nowait(q);
>   	/* nothing to wait for non-mq queues */
>   	if (queue_is_mq(q))
> -		blk_mq_wait_quiesce_done(q);
> +		blk_mq_wait_quiesce_done(q->tag_set);
>   }
>   EXPORT_SYMBOL_GPL(blk_mq_quiesce_queue);
>   
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 44a5321743128..a74212a4f1a5f 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -5100,7 +5100,7 @@ static void nvme_stop_ns_queue(struct nvme_ns *ns)
>   	if (!test_and_set_bit(NVME_NS_STOPPED, &ns->flags))
>   		blk_mq_quiesce_queue(ns->queue);
>   	else
> -		blk_mq_wait_quiesce_done(ns->queue);
> +		blk_mq_wait_quiesce_done(ns->queue->tag_set);
>   }
>   
>   /*
> @@ -5216,7 +5216,7 @@ void nvme_stop_admin_queue(struct nvme_ctrl *ctrl)
>   	if (!test_and_set_bit(NVME_CTRL_ADMIN_Q_STOPPED, &ctrl->flags))
>   		blk_mq_quiesce_queue(ctrl->admin_q);
>   	else
> -		blk_mq_wait_quiesce_done(ctrl->admin_q);
> +		blk_mq_wait_quiesce_done(ctrl->admin_q->tag_set);
>   }
>   EXPORT_SYMBOL_GPL(nvme_stop_admin_queue);
>   
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index 8b89fab7c4206..249757ddd8fea 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -2735,7 +2735,7 @@ static void scsi_stop_queue(struct scsi_device *sdev, bool nowait)
>   			blk_mq_quiesce_queue(sdev->request_queue);
>   	} else {
>   		if (!nowait)
> -			blk_mq_wait_quiesce_done(sdev->request_queue);
> +			blk_mq_wait_quiesce_done(sdev->request_queue->tag_set);
>   	}
>   }
>   
> diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
> index f040a7cab5dbf..dfd565c4fb84e 100644
> --- a/include/linux/blk-mq.h
> +++ b/include/linux/blk-mq.h
> @@ -881,7 +881,7 @@ void blk_mq_start_hw_queues(struct request_queue *q);
>   void blk_mq_start_stopped_hw_queue(struct blk_mq_hw_ctx *hctx, bool async);
>   void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async);
>   void blk_mq_quiesce_queue(struct request_queue *q);
> -void blk_mq_wait_quiesce_done(struct request_queue *q);
> +void blk_mq_wait_quiesce_done(struct blk_mq_tag_set *set);
>   void blk_mq_unquiesce_queue(struct request_queue *q);
>   void blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs);
>   void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async);
>