From 2d9ff01befcf944ee5e1fb31f686ea228f6b1f37 Mon Sep 17 00:00:00 2001
From: Ed Cashin <ecashin@coraid.com>
Date: Thu, 4 Oct 2012 17:16:29 -0700
Subject: [PATCH] --- yaml --- r: 330183 b: refs/heads/master c:
 d54d35ac6605161a593e3f4411de338ef81b5263 h: refs/heads/master i:   330181:
 bcdc3fb456f12b46a6a15c900192021f7fadb9a6   330179:
 0f1b7496956cc2903ba544c25e174007089d013e   330175:
 85c4e9e52b44dd1d8c5c1fbccdebe548e2cc10c4 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/aoe/aoe.h    | 1 -
 trunk/drivers/block/aoe/aoecmd.c | 8 +++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 445669c732b2..3455182e301f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f0f0133747368fe0fcf3908f788b53591bff4e0
+refs/heads/master: d54d35ac6605161a593e3f4411de338ef81b5263
diff --git a/trunk/drivers/block/aoe/aoe.h b/trunk/drivers/block/aoe/aoe.h
index ffded64dcbeb..d17b72763973 100644
--- a/trunk/drivers/block/aoe/aoe.h
+++ b/trunk/drivers/block/aoe/aoe.h
@@ -96,7 +96,6 @@ enum {
 	TIMERTICK = HZ / 10,
 	MINTIMER = HZ >> 2,
 	MAXTIMER = HZ << 1,
-	HELPWAIT = 20,
 };
 
 struct buf {
diff --git a/trunk/drivers/block/aoe/aoecmd.c b/trunk/drivers/block/aoe/aoecmd.c
index bbab40c8d67c..e3291dfa7607 100644
--- a/trunk/drivers/block/aoe/aoecmd.c
+++ b/trunk/drivers/block/aoe/aoecmd.c
@@ -633,11 +633,9 @@ rexmit_timer(ulong vp)
 		list_del(pos);
 
 		t = f->t;
-		if (n > HELPWAIT) {
-			/* see if another target can help */
-			if (d->ntargets > 1)
-				d->htgt = t;
-		}
+		if (n > aoe_deadsecs/2)
+			d->htgt = t; /* see if another target can help */
+
 		if (t->nout == t->maxout) {
 			if (t->maxout > 1)
 				t->maxout--;