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

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

[SCSI] ibmvfc: Reduce error recovery timeout 



If a command times out resulting in EH getting invoked, we wait for the
aborted commands to come back after sending the abort. Shorten
the amount of time we wait for these responses, to ensure we don't
get stuck in EH for several minutes.

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

drivers/scsi/ibmvscsi/ibmvfc.c

+1 −1
Original line number Diff line number Diff line
@@ -2245,7 +2245,7 @@ static int ibmvfc_wait_for_ops(struct ibmvfc_host *vhost, void *device, 
	DECLARE_COMPLETION_ONSTACK(comp);

	int wait;

	unsigned long flags;

	signed long timeout = init_timeout * HZ;

	signed long timeout = IBMVFC_ABORT_WAIT_TIMEOUT * HZ;



	ENTER;

	do {

drivers/scsi/ibmvscsi/ibmvfc.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#define IBMVFC_ADISC_PLUS_CANCEL_TIMEOUT	\

		(IBMVFC_ADISC_TIMEOUT + IBMVFC_ADISC_CANCEL_TIMEOUT)

#define IBMVFC_INIT_TIMEOUT		120

#define IBMVFC_ABORT_WAIT_TIMEOUT	40

#define IBMVFC_MAX_REQUESTS_DEFAULT	100



#define IBMVFC_DEBUG			0