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

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

[SCSI] ibmvfc: Fix adapter cancel flags for terminate_rport_io 



When issuing a Cancel to the virtual fibre channel adapter,
the interface specifies a flags field for the client to indicate
what kind of error recovery is being performed. Fix up these
flags for terminate_rport_io to indicate an abort task set
rather than a target reset.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 861890c6

drivers/scsi/ibmvscsi/ibmvfc.c

+16 −4
Original line number Diff line number Diff line
@@ -2064,12 +2064,24 @@ static int ibmvfc_eh_device_reset_handler(struct scsi_cmnd *cmd) 
}



/**

 * ibmvfc_dev_cancel_all - Device iterated cancel all function

 * ibmvfc_dev_cancel_all_abts - Device iterated cancel all function

 * @sdev:	scsi device struct

 * @data:	return code

 *

 **/

static void ibmvfc_dev_cancel_all(struct scsi_device *sdev, void *data)

static void ibmvfc_dev_cancel_all_abts(struct scsi_device *sdev, void *data)

{

	unsigned long *rc = data;

	*rc |= ibmvfc_cancel_all(sdev, IBMVFC_TMF_ABORT_TASK_SET);

}



/**

 * ibmvfc_dev_cancel_all_reset - Device iterated cancel all function

 * @sdev:	scsi device struct

 * @data:	return code

 *

 **/

static void ibmvfc_dev_cancel_all_reset(struct scsi_device *sdev, void *data)

{

	unsigned long *rc = data;

	*rc |= ibmvfc_cancel_all(sdev, IBMVFC_TMF_TGT_RESET);
@@ -2105,7 +2117,7 @@ static int ibmvfc_eh_target_reset_handler(struct scsi_cmnd *cmd) 


	ENTER;

	ibmvfc_wait_while_resetting(vhost);

	starget_for_each_device(starget, &cancel_rc, ibmvfc_dev_cancel_all);

	starget_for_each_device(starget, &cancel_rc, ibmvfc_dev_cancel_all_reset);

	reset_rc = ibmvfc_reset_device(sdev, IBMVFC_TARGET_RESET, "target");



	if (!cancel_rc && !reset_rc)
@@ -2147,7 +2159,7 @@ static void ibmvfc_terminate_rport_io(struct fc_rport *rport) 
	int rc = FAILED;



	ENTER;

	starget_for_each_device(starget, &cancel_rc, ibmvfc_dev_cancel_all);

	starget_for_each_device(starget, &cancel_rc, ibmvfc_dev_cancel_all_abts);

	starget_for_each_device(starget, &abort_rc, ibmvfc_dev_abort_all);



	if (!cancel_rc && !abort_rc)