From ecashin@coraid.com Wed Jan 25 11:20:59 2006 Message-ID: <650dd8ca525b7e32c55292cba7c7eda2@coraid.com> Date: Wed, 25 Jan 2006 13:54:44 -0500 To: linux-kernel@vger.kernel.org CC: ecashin@coraid.com, Greg K-H Subject: aoe: do not stop retransmit timer when device goes down From: "Ed L. Cashin" This patch is a bugfix that follows and depends on the eight aoe driver patches sent January 19th. Signed-off-by: "Ed L. Cashin" Signed-off-by: Greg Kroah-Hartman --- drivers/block/aoe/aoecmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- gregkh-2.6.orig/drivers/block/aoe/aoecmd.c +++ gregkh-2.6/drivers/block/aoe/aoecmd.c @@ -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); }