| From daa142d1773dd3a986f02a8a4da929608d24daaa Mon Sep 17 00:00:00 2001 |
| From: Brian King <brking@linux.vnet.ibm.com> |
| Date: Tue, 20 Apr 2010 14:21:35 -0500 |
| Subject: [SCSI] ibmvfc: Reduce error recovery timeout |
| |
| From: Brian King <brking@linux.vnet.ibm.com> |
| |
| commit daa142d1773dd3a986f02a8a4da929608d24daaa upstream. |
| |
| 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: Brian King <brking@linux.vnet.ibm.com> |
| Signed-off-by: James Bottomley <James.Bottomley@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- |
| drivers/scsi/ibmvscsi/ibmvfc.h | 1 + |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/scsi/ibmvscsi/ibmvfc.c |
| +++ b/drivers/scsi/ibmvscsi/ibmvfc.c |
| @@ -2245,7 +2245,7 @@ static int ibmvfc_wait_for_ops(struct ib |
| 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 { |
| --- a/drivers/scsi/ibmvscsi/ibmvfc.h |
| +++ b/drivers/scsi/ibmvscsi/ibmvfc.h |
| @@ -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 |
