scsi: Inline scsi_mq_alloc_queue()
PATCH 1/1 scsi: Inline scsi_mq_alloc_queue()
Since scsi_mq_alloc_queue() only has one caller, inline it. This change was suggested by Christoph Hellwig.
Cc Christoph Hellwig <[email protected]>
Cc Ming Lei <[email protected]>
Cc Ed Tsai <[email protected]>
Signed-off-by Bart Van Assche <[email protected]>
--- drivers/scsi/scsi_lib.c | 12 ------------ drivers/scsi/scsi_priv.h | 1 - drivers/scsi/scsi_scan.c | 12 ++++++++---- 3 files changed, 8 insertions(+), 17 deletions(-)
drivers/scsi/scsi_lib.c +0 -12
@@ -1897,18 +1897,6 @@ static const struct blk_mq_ops scsi_mq_ops = { .get_rq_budget_token = scsi_mq_get_rq_budget_token, }; -struct request_queue *scsi_mq_alloc_queue (struct scsi_device *sdev) -{ - sdev->request_queue =blk_mq_init_queue (&sdev->host->tag_set); -if (IS_ERR (sdev->request_queue)) -return NULL ; - - sdev->request_queue->queuedata = sdev; -__scsi_init_queue (sdev->host, sdev->request_queue); -blk_queue_flag_set (QUEUE_FLAG_SCSI_PASSTHROUGH , sdev->request_queue); -return sdev->request_queue; -} -int scsi_mq_setup_tags (struct Scsi_Host *shost) {unsigned int cmd_size, sgl_size;
drivers/scsi/scsi_priv.h +0 -1
@@ -91,7 +91,6 @@ extern void scsi_queue_insert(struct scsi_cmnd *cmd, int reason);extern void scsi_io_completion (struct scsi_cmnd *,unsigned int );extern void scsi_run_host_queues (struct Scsi_Host *shost);extern void scsi_requeue_run_queue (struct work_struct *work); -extern struct request_queue *scsi_mq_alloc_queue (struct scsi_device *sdev);extern void scsi_start_queue (struct scsi_device *sdev);extern int scsi_mq_setup_tags (struct Scsi_Host *shost);extern void scsi_mq_destroy_tags (struct Scsi_Host *shost);
drivers/scsi/scsi_scan.c +8 -4
@@ -217,6 +217,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, {unsigned int depth;struct scsi_device *sdev; +struct request_queue *q;int display_failure_msg =1 , ret;struct Scsi_Host *shost =dev_to_shost (starget->dev.parent);
@@ -266,16 +267,19 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,*/ sdev->borken =1 ; - sdev->request_queue =scsi_mq_alloc_queue (sdev); -if (!sdev->request_queue) { + q =blk_mq_init_queue (&sdev->host->tag_set); +if (IS_ERR (q)) {/* release fn is set up in scsi_sysfs_device_initialise, so * have to free and put manually here */ put_device (&starget->dev);kfree (sdev); goto out; } -WARN_ON_ONCE (!blk_get_queue (sdev->request_queue)); - sdev->request_queue->queuedata = sdev; + sdev->request_queue = q; + q->queuedata = sdev; +__scsi_init_queue (sdev->host, q); +blk_queue_flag_set (QUEUE_FLAG_SCSI_PASSTHROUGH , q); +WARN_ON_ONCE (!blk_get_queue (q)); depth = sdev->host->cmd_per_lun ?:1 ;
Quoted 2 lines · Bart Van Assche
Since
scsi_mq_alloc_queue()only has one caller, inline it. This change was suggested by Christoph Hellwig.
Looks good,
Reviewed-by Christoph Hellwig <[email protected]>
Quoted 8 lines · Bart Van Assche
Since
scsi_mq_alloc_queue()only has one caller, inline it. This change was suggested by Christoph Hellwig.Cc Christoph Hellwig <[email protected]>Cc Ming Lei <[email protected]>Cc Ed Tsai <[email protected]>Signed-off-by Bart Van Assche <[email protected]>
Reviewed-by Ming Lei <[email protected]>
Martin K. Petersen
AppliedBart,
Quoted 2 lines
Since
scsi_mq_alloc_queue()only has one caller, inline it. This change was suggested by Christoph Hellwig.
Applied to 5.14/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 2 lines · Bart Van Assche
Since
scsi_mq_alloc_queue()only has one caller, inline it. This change was suggested by Christoph Hellwig.
Applied to 5.14/scsi-queue, thanks!
[1/1] scsi: Inline scsi_mq_alloc_queue()
https://git.kernel.org/mkp/scsi/c/59506abe5e34
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering