Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8804b72 authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[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: default avatarBrian King <brking@linux.vnet.ibm.com>
Acked-by: default avatarRobert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 96e58ce0

drivers/scsi/ibmvscsi/ibmvfc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2327,7 +2327,7 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev) 
	timeout = wait_for_completion_timeout(&evt->comp, timeout);

	timeout = wait_for_completion_timeout(&evt->comp, timeout);





	if (!timeout) {

	if (!timeout) {

		rc = ibmvfc_cancel_all(sdev, IBMVFC_TMF_ABORT_TASK_SET);

		rc = ibmvfc_cancel_all(sdev, 0);

		if (!rc) {

		if (!rc) {

			rc = ibmvfc_wait_for_ops(vhost, sdev->hostdata, ibmvfc_match_key);

			rc = ibmvfc_wait_for_ops(vhost, sdev->hostdata, ibmvfc_match_key);

			if (rc == SUCCESS)

			if (rc == SUCCESS)