diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2013-04-12 08:25:15 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-02 11:50:23 -0700 |
| commit | f8804b7239b27baca1ab44344318acb8fd55f9ae (patch) | |
| tree | c000d21c8a02d0653413eeae718f0690f175662a /drivers/scsi/ibmvscsi/ibmvfc.c | |
| parent | 96e58ce0f64a9d34a4bbeb7916884f327baa5ff1 (diff) | |
| download | op-kernel-dev-f8804b7239b27baca1ab44344318acb8fd55f9ae.zip op-kernel-dev-f8804b7239b27baca1ab44344318acb8fd55f9ae.tar.gz | |
[SCSI] ibmvfc: Properly set cancel flags when cancelling abort
The flags on a cancel operation are intended to indicate what,
if any, TMF will follow the cancel request. This fixes a case
where we were incorrectly setting the abort task set flag on
the cancel flag when we were cancelling an abort task set.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Acked-by: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/ibmvscsi/ibmvfc.c')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvfc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index cc82d0f..e652620 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -2327,7 +2327,7 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev) timeout = wait_for_completion_timeout(&evt->comp, timeout); if (!timeout) { - rc = ibmvfc_cancel_all(sdev, IBMVFC_TMF_ABORT_TASK_SET); + rc = ibmvfc_cancel_all(sdev, 0); if (!rc) { rc = ibmvfc_wait_for_ops(vhost, sdev->hostdata, ibmvfc_match_key); if (rc == SUCCESS) |
