Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit daa142d1773dd3a986f02a8a4da929608d24daaa

Authored by Brian King
Committed by James Bottomley
1 parent f5832fa2f8
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

Showing 2 changed files with 2 additions and 1 deletions Side-by-side Diff

drivers/scsi/ibmvscsi/ibmvfc.c
Diff comments   View file @ daa142d
... ... @@ -2245,7 +2245,7 @@
2245 2245 DECLARE_COMPLETION_ONSTACK(comp);
2246 2246 int wait;
2247 2247 unsigned long flags;
2248   - signed long timeout = init_timeout * HZ;
  2248 + signed long timeout = IBMVFC_ABORT_WAIT_TIMEOUT * HZ;
2249 2249  
2250 2250 ENTER;
2251 2251 do {
drivers/scsi/ibmvscsi/ibmvfc.h
Diff comments   View file @ daa142d
... ... @@ -38,6 +38,7 @@
38 38 #define IBMVFC_ADISC_PLUS_CANCEL_TIMEOUT \
39 39 (IBMVFC_ADISC_TIMEOUT + IBMVFC_ADISC_CANCEL_TIMEOUT)
40 40 #define IBMVFC_INIT_TIMEOUT 120
  41 +#define IBMVFC_ABORT_WAIT_TIMEOUT 40
41 42 #define IBMVFC_MAX_REQUESTS_DEFAULT 100
42 43  
43 44 #define IBMVFC_DEBUG 0