From: Bart Van Assche <bvanassche@acm.org>
To: Christoph Hellwig <hch@lst.de>, linux-scsi@vger.kernel.org
Subject: Re: [PATCH 2/8] scsi: remove scsi_next_command
Date: Wed, 01 Oct 2014 14:06:03 +0200 [thread overview]
Message-ID: <542BEE2B.6030105@acm.org> (raw)
In-Reply-To: <1410107469-896-3-git-send-email-hch@lst.de>
On 09/07/14 18:31, 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@lst.de>
> ---
> 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 8b76231..f21e661 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -542,17 +542,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;
> @@ -730,8 +719,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;
>
> @@ -742,9 +729,12 @@ static bool scsi_end_request(struct request *req, int error,
> if (bidi_bytes)
> scsi_release_bidi_buffers(cmd);
> scsi_release_buffers(cmd);
> - scsi_next_command(cmd);
> +
> + scsi_put_command(cmd);
> + scsi_run_queue(q);
> }
>
> + put_device(&sdev->sdev_gendev);
> return false;
> }
>
> diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
> index 12b8e1b..2a382c1 100644
> --- a/drivers/scsi/scsi_priv.h
> +++ b/drivers/scsi/scsi_priv.h
> @@ -84,7 +84,6 @@ int scsi_noretry_cmd(struct scsi_cmnd *scmd);
> extern int scsi_maybe_unblock_host(struct scsi_device *sdev);
> extern void scsi_device_unbusy(struct scsi_device *sdev);
> extern void scsi_queue_insert(struct scsi_cmnd *cmd, int reason);
> -extern void scsi_next_command(struct scsi_cmnd *cmd);
> extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);
> extern void scsi_run_host_queues(struct Scsi_Host *shost);
> extern struct request_queue *scsi_alloc_queue(struct scsi_device *sdev);
>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
next prev parent reply other threads:[~2014-10-01 12:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-07 16:31 I/O path cleanup Christoph Hellwig
2014-09-07 16:31 ` [PATCH 1/8] scsi: don't use scsi_next_command in scsi_reset_provider Christoph Hellwig
2014-10-01 12:03 ` Bart Van Assche
2014-09-07 16:31 ` [PATCH 2/8] scsi: remove scsi_next_command Christoph Hellwig
2014-10-01 12:06 ` Bart Van Assche [this message]
2014-09-07 16:31 ` [PATCH 3/8] scsi: clean up S/G table freeing Christoph Hellwig
2014-10-01 12:22 ` Bart Van Assche
2014-10-01 21:05 ` Christoph Hellwig
2014-09-07 16:31 ` [PATCH 4/8] scsi: stop passing a gfp_mask argument down the command setup path Christoph Hellwig
2014-10-01 12:28 ` Bart Van Assche
2014-09-07 16:31 ` [PATCH 5/8] scsi: move scsi_dispatch_cmd to scsi_lib.c Christoph Hellwig
2014-10-01 12:30 ` Bart Van Assche
2014-09-07 16:31 ` [PATCH 6/8] scsi: move more requeue handling into scsi_requeue_command Christoph Hellwig
2014-10-01 12:33 ` Bart Van Assche
2014-09-07 16:31 ` [PATCH 7/8] scsi: split error handling slow path out of scsi_io_completion Christoph Hellwig
2014-10-01 12:46 ` Bart Van Assche
2014-09-07 16:31 ` [PATCH 8/8] scsi: merge scsi_finish_command and scsi_io_completion Christoph Hellwig
2014-10-01 12:55 ` Bart Van Assche
2014-09-08 7:22 ` I/O path cleanup Bart Van Assche
2014-09-08 15:13 ` Christoph Hellwig
2014-09-30 13:31 ` Bart Van Assche
2014-09-30 13:43 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=542BEE2B.6030105@acm.org \
--to=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).