On 11/06/2014 08:40 AM, Christoph Hellwig wrote:
> There's only one caller left, so inline it and reduce the blk-mq vs !blk-mq
> diff a litte bit.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> Reviewed-by: Bart Van Assche <bvanassche@xxxxxxx>
> ---
> drivers/scsi/scsi_lib.c | 18 ++++--------------
> drivers/scsi/scsi_priv.h | 1 -
> 2 files changed, 4 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index 38f8c85..1a3546e8 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -543,17 +543,6 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
> put_device(&sdev->sdev_gendev);
> }
>
> -void scsi_next_command(struct scsi_cmnd *cmd)
> -{
> - struct scsi_device *sdev = cmd->device;
> - struct request_queue *q = sdev->request_queue;
> -
> - scsi_put_command(cmd);
> - scsi_run_queue(q);
> -
> - put_device(&sdev->sdev_gendev);
> -}
> -
> void scsi_run_host_queues(struct Scsi_Host *shost)
> {
> struct scsi_device *sdev;
> @@ -731,8 +720,6 @@ static bool scsi_end_request(struct request *req, int error,
> kblockd_schedule_work(&sdev->requeue_work);
> else
> blk_mq_start_stopped_hw_queues(q, true);
> -
> - put_device(&sdev->sdev_gendev);
> } else {
> unsigned long flags;
>
> @@ -744,9 +731,12 @@ static bool scsi_end_request(struct request *req, int error,
> spin_unlock_irqrestore(q->queue_lock, flags);
>
> scsi_release_buffers(cmd);
> - scsi_next_command(cmd);
> +
> + scsi_put_command(cmd);
> + scsi_run_queue(q);
> }
>
> + put_device(&sdev->sdev_gendev);
> return false;
> }
>
Hmm? Isn't there a scsi_put_comand() too many?
You dropped it from the 'if' branch, moved it out of
the condition, but kept in in the 'else' branch ...
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@xxxxxxx +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
