aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libfc/fc_fcp.c
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2009-05-06 10:52:23 -0700
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-06-08 13:29:10 -0500
commitd5e6054a0a097527b3920a8a0aefe7f830c014fd (patch)
treec10e28eb8c3feaa760bde491b530464b45a7b6a3 /drivers/scsi/libfc/fc_fcp.c
parent[SCSI] fcoe: use ETH_P_FIP for skb->protocol of FIP frames (diff)
downloadlinux-dev-d5e6054a0a097527b3920a8a0aefe7f830c014fd.tar.xz
linux-dev-d5e6054a0a097527b3920a8a0aefe7f830c014fd.zip
[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>
Diffstat (limited to 'drivers/scsi/libfc/fc_fcp.c')
-rw-r--r--drivers/scsi/libfc/fc_fcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 521f996f9b13..ad8b747837b0 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -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;