Commit 1bcb9304 authored Apr 06, 2017 by Hannes Reinecke Committed by Martin K. Petersen Apr 06, 2017

scsi: always send command aborts



When a command has timed out we always should be sending an
abort; with the previous code a failed abort might signal
SCSI EH to start, and all other timed out commands will
never be aborted, even though they might belong to a
different ITL nexus.

Cc: Benjamin Block <bblock@linux.vnet.ibm.com>
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent e8f8d50e

drivers/scsi/scsi_error.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -196,19 +196,7 @@ scsi_abort_command(struct scsi_cmnd *scmd)
		return FAILED;
		}

		/*
		* Do not try a command abort if
		* SCSI EH has already started.
		*/
		spin_lock_irqsave(shost->host_lock, flags);
		if (scsi_host_in_recovery(shost)) {
		spin_unlock_irqrestore(shost->host_lock, flags);
		SCSI_LOG_ERROR_RECOVERY(3,
		scmd_printk(KERN_INFO, scmd,
		"not aborting, host in recovery\n"));
		return FAILED;
		}

		if (shost->eh_deadline != -1 && !shost->last_reset)
		shost->last_reset = jiffies;
		spin_unlock_irqrestore(shost->host_lock, flags);