aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/device_handler
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2011-08-24 04:51:19 -0400
committerJames Bottomley <JBottomley@Parallels.com>2011-08-30 15:33:06 -0400
commitebd1f645bd4a284022c7d449a63fe48a3fc5a86e (patch)
tree8864088ac31540e775b11f7c44cf69c570c8ab1c /drivers/scsi/device_handler
parentcfde3fa166c7367258ab32c8a092ae787b2bc8af (diff)
[SCSI] scsi_dh_alua: Decrease retry interval
The alua device handler starts the first retry after 10 seconds, and increases it times 10 for each round. This leads to an unnecessary delay. This patch modifies it to start after one second, and increase by a factor of two. Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/device_handler')
-rw-r--r--drivers/scsi/device_handler/scsi_dh_alua.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index 34c66118dfc4..9dce3670f8de 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/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)
506 int len, k, off, valid_states = 0; 506 int len, k, off, valid_states = 0;
507 unsigned char *ucp; 507 unsigned char *ucp;
508 unsigned err; 508 unsigned err;
509 unsigned long expiry, interval = 10; 509 unsigned long expiry, interval = 1;
510 510
511 expiry = round_jiffies_up(jiffies + ALUA_FAILOVER_TIMEOUT); 511 expiry = round_jiffies_up(jiffies + ALUA_FAILOVER_TIMEOUT);
512 retry: 512 retry:
@@ -567,7 +567,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
567 case TPGS_STATE_TRANSITIONING: 567 case TPGS_STATE_TRANSITIONING:
568 if (time_before(jiffies, expiry)) { 568 if (time_before(jiffies, expiry)) {
569 /* State transition, retry */ 569 /* State transition, retry */
570 interval *= 10; 570 interval *= 2;
571 msleep(interval); 571 msleep(interval);
572 goto retry; 572 goto retry;
573 } 573 }