---

yaml --- r: 330183 b: refs/heads/master c: d54d35a h: refs/heads/master i: 330181: bcdc3fb 330179: 0f1b749 330175: 85c4e9e v: v3
git-mirror · Oct 5, 2012 · 2d9ff01 · 2d9ff01
1 parent a0f4436
commit 2d9ff01
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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--;