Skip to content

Commit

Permalink
scsi: don't use scsi_next_command in scsi_reset_provider
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christoph Hellwig committed Nov 24, 2014
1 parent d7cb71e commit 0f121dd
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/scsi/scsi_error.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 0f121dd

Please sign in to comment.