[SCSI] ibmvfc: Reduce error recovery timeout
authorBrian King <brking@linux.vnet.ibm.com>
Tue, 20 Apr 2010 19:21:35 +0000 (14:21 -0500)
committerJames Bottomley <James.Bottomley@suse.de>
Sun, 2 May 2010 15:03:22 +0000 (11:03 -0400)
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>
drivers/scsi/ibmvscsi/ibmvfc.c
drivers/scsi/ibmvscsi/ibmvfc.h

index 9372169374e2f7dbc0576a7d9bfbd2194290b540..d18f45c95639883c9df5ab74ef6f07375ab9eaeb 100644 (file)
@@ -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 {
index d25106a958d7bd50dede90e688000ef73acd89bd..7e9742764e4bc56d08061546b67c47efc6552fff 100644 (file)
@@ -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