From 2bd62698a4909cfe7d86a093c24032ea9347571f Mon Sep 17 00:00:00 2001 From: Yi Zou Date: Tue, 30 Nov 2010 16:19:20 -0800 Subject: [PATCH] --- yaml --- r: 226799 b: refs/heads/master c: d889b30a9196c453120ca54323fe80acb4c27b94 h: refs/heads/master i: 226797: df4e5b0d79cc087f9b4c5bc57c31b34b7cc5d62d 226795: 34357330edeb22e1e4c04ac6a9506f2369e07416 226791: 897687d17fa8375f97236d2800cd98b24782c719 226783: 9d26d2ac3b1fe9137a933cea5be69f910db2e7a2 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libfc/fc_fcp.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d43086fbbe8d..65708d1a6865 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b90dc80ba2e566a48585174b1e5ab00e16f0456 +refs/heads/master: d889b30a9196c453120ca54323fe80acb4c27b94 diff --git a/trunk/drivers/scsi/libfc/fc_fcp.c b/trunk/drivers/scsi/libfc/fc_fcp.c index a36c652edbba..47c930a01454 100644 --- a/trunk/drivers/scsi/libfc/fc_fcp.c +++ b/trunk/drivers/scsi/libfc/fc_fcp.c @@ -973,7 +973,13 @@ static void fc_fcp_complete_locked(struct fc_fcp_pkt *fsp) } lport->tt.exch_done(seq); } - fc_io_compl(fsp); + /* + * Some resets driven by SCSI are not I/Os and do not have + * SCSI commands associated with the requests. We should not + * call I/O completion if we do not have a SCSI command. + */ + if (fsp->cmd) + fc_io_compl(fsp); } /**