evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scsi: don't use scsi_next_command in scsi_reset_provider

Browse source 
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>
This commit is contained in:
Christoph Hellwig 2014-09-05 18:00:05 -07:00
parent d7cb71ec3a
commit 0f121dd85d
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/scsi/scsi_error.c
View file

@ -2337,14 +2337,9 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg)
return -EIO; return -EIO;
error = -EIO; error = -EIO;
if (!get_device(&dev->sdev_gendev))
goto out_put_autopm_host;
scmd = scsi_get_command(dev, GFP_KERNEL); scmd = scsi_get_command(dev, GFP_KERNEL);
if (!scmd) { if (!scmd)
put_device(&dev->sdev_gendev);
goto out_put_autopm_host; goto out_put_autopm_host;
}
blk_rq_init(NULL, &req); blk_rq_init(NULL, &req);
scmd->request = &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")); "waking up host to restart after TMF\n"));
wake_up(&shost->host_wait); wake_up(&shost->host_wait);
scsi_run_host_queues(shost); scsi_run_host_queues(shost);
scsi_next_command(scmd); scsi_put_command(scmd);
out_put_autopm_host: out_put_autopm_host:
scsi_autopm_put_host(shost); scsi_autopm_put_host(shost);
return error; return error;