Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f121dd8 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent d7cb71ec

drivers/scsi/scsi_error.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -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;