[PATCH 2.6.15-git9a] aoe [1/1]: do not stop retransmit timer when device goes down

["Ed L. Cashin" <ecashin@coraid.com>]

This patch is a bugfix that follows and depends on the
eight aoe driver patches sent January 19th.

Signed-off-by: "Ed L. Cashin" <ecashin@coraid.com>

When taking an AoE device down, keep the retransmit timer
going so that it re-appears properly when detected later.

diff -upr 2.6.15-git9a-orig/drivers/block/aoe/aoecmd.c 2.6.15-git9a-aoe/drivers/block/aoe/aoecmd.c
--- 2.6.15-git9a-orig/drivers/block/aoe/aoecmd.c	2006-01-19 13:31:23.000000000 -0500
+++ 2.6.15-git9a-aoe/drivers/block/aoe/aoecmd.c	2006-01-25 13:49:07.000000000 -0500
@@ -331,7 +331,7 @@ rexmit_timer(ulong vp)
 	spin_lock_irqsave(&d->lock, flags);
 
 	if (d->flags & DEVFL_TKILL) {
-tdie:		spin_unlock_irqrestore(&d->lock, flags);
+		spin_unlock_irqrestore(&d->lock, flags);
 		return;
 	}
 	f = d->frames;
@@ -342,7 +342,7 @@ tdie:		spin_unlock_irqrestore(&d->lock, 
 			n /= HZ;
 			if (n > MAXWAIT) { /* waited too long.  device failure. */
 				aoedev_downdev(d);
-				goto tdie;
+				break;
 			}
 			rexmit(d, f);
 		}


-- 
  "Ed L. Cashin" <ecashin@coraid.com>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/