scsi: don't use scsi_next_command in scsi_reset_provider

scsi_reset_provider already manually runs all queues for the given host,
so it doesn't need the scsi_run_queues call from it, and it doesn't need
a reference on the device because it's synchronous.

So let's just call scsi_put_command directly and avoid the device reference
dance to simplify the code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a6f6b9222b515577ba7619f912043ed09653d63f..96627bae753cd71c127b8cc99a8125123dc09078 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -2337,14 +2337,9 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg)
                return -EIO;
 
        error = -EIO;
-       if (!get_device(&dev->sdev_gendev))
-               goto out_put_autopm_host;
-
        scmd = scsi_get_command(dev, GFP_KERNEL);
-       if (!scmd) {
-               put_device(&dev->sdev_gendev);
+       if (!scmd)
                goto out_put_autopm_host;
-       }
 
        blk_rq_init(NULL, &req);
        scmd->request = &req;
@@ -2406,10 +2401,10 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg)
                             "waking up host to restart after TMF\n"));
 
        wake_up(&shost->host_wait);
-
        scsi_run_host_queues(shost);
 
-       scsi_next_command(scmd);
+       scsi_put_command(scmd);
+
 out_put_autopm_host:
        scsi_autopm_put_host(shost);
        return error;