Commit d5e6054a authored May 06, 2009 by Mike Christie Committed by James Bottomley Jun 08, 2009

[SCSI] libfc: use DID_ERROR when we have internall aborted command

If we aborted a command, because it timed out we should not use
DID_ABORT. It will fail the command right away back to the upper
layer. We want to use something that indicated that the problem
did not complete normally, but it was not a fatal problem.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 0f491539

drivers/scsi/libfc/fc_fcp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1896,7 +1896,7 @@ static void fc_io_compl(struct fc_fcp_pkt *fsp)
		sc_cmd->result = (DID_ERROR << 16) \| fsp->cdb_status;
		break;
		case FC_CMD_ABORTED:
		sc_cmd->result = (DID_ABORT << 16) \| fsp->io_status;
		sc_cmd->result = (DID_ERROR << 16) \| fsp->io_status;
		break;
		case FC_CMD_TIME_OUT:
		sc_cmd->result = (DID_BUS_BUSY << 16) \| fsp->io_status;

Admin message