From 17b1c5d6e8d350787b27cf83ea0c6188b32594fb Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Wed, 24 Aug 2011 10:51:19 +0200 Subject: [PATCH] --- yaml --- r: 271037 b: refs/heads/master c: ebd1f645bd4a284022c7d449a63fe48a3fc5a86e h: refs/heads/master i: 271035: 1ce13506da6e4c04e8279be83192ff4846107ae1 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/device_handler/scsi_dh_alua.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e22655b29f8a..976b82579f88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfde3fa166c7367258ab32c8a092ae787b2bc8af +refs/heads/master: ebd1f645bd4a284022c7d449a63fe48a3fc5a86e diff --git a/trunk/drivers/scsi/device_handler/scsi_dh_alua.c b/trunk/drivers/scsi/device_handler/scsi_dh_alua.c index 34c66118dfc4..9dce3670f8de 100644 --- a/trunk/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/trunk/drivers/scsi/device_handler/scsi_dh_alua.c @@ -506,7 +506,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h) int len, k, off, valid_states = 0; unsigned char *ucp; unsigned err; - unsigned long expiry, interval = 10; + unsigned long expiry, interval = 1; expiry = round_jiffies_up(jiffies + ALUA_FAILOVER_TIMEOUT); retry: @@ -567,7 +567,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h) case TPGS_STATE_TRANSITIONING: if (time_before(jiffies, expiry)) { /* State transition, retry */ - interval *= 10; + interval *= 2; msleep(interval); goto retry; }