aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorYi Zou <yi.zou@intel.com>2009-10-21 19:27:12 -0400
committerJames Bottomley <James.Bottomley@suse.de>2009-12-04 13:00:27 -0500
commit4347fa66878e079766258bc0d077c350cb31a799 (patch)
treefce5fee754b75169e6983914a077a1732932ad75 /drivers/scsi
parentc340111dbb48482cd23f4e441deff9169be9bc6f (diff)
[SCSI] libfc: Fix wrong scsi return status under FC_DATA_UNDRUN
This bug is exposed when there is a link flap in LLD. Particularly, when it happens right after a SCSI write command is sent out, no FCP_DATA is sent, causing fsp->status_code to be set as FC_DATA_UNDRUN in fc_fcp_complete_locked even no SCSI status is received. Consequently, fc_io_compl treats this as DID_OK. This results in SCSI returning successful to the initial I/O request even there is no DATA actually sent. Particularly, if you run an I/O tool w/ data verification on, the read back for verification is gonna fail. This is fixed here by checking when FC_DATA_UNDRUN happens, SCSI status is received w/ FC_SRB_RCV_STATUS set in fsp->state. Signed-off-by: Yi Zou <yi.zou@intel.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/libfc/fc_fcp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index ade962d74fb9..40ed7442d9df 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -1849,7 +1849,8 @@ static void fc_io_compl(struct fc_fcp_pkt *fsp)
1849 * scsi status is good but transport level 1849 * scsi status is good but transport level
1850 * underrun. 1850 * underrun.
1851 */ 1851 */
1852 sc_cmd->result = DID_OK << 16; 1852 sc_cmd->result = (fsp->state & FC_SRB_RCV_STATUS ?
1853 DID_OK : DID_ERROR) << 16;
1853 } else { 1854 } else {
1854 /* 1855 /*
1855 * scsi got underrun, this is an error 1856 * scsi got underrun, this is an error