[PATCH] aoe: do not stop retransmit timer when device goes down

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 22bebf87945c7aaa268614394551db5f370734b5..207aabcd1f4ecffb5f7b0d99f45d9cb9b5c8bb68 100644 (file)
--- a/drivers/block/aoe/aoecmd.c
+++ b/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, flags);
                        n /= HZ;
                        if (n > MAXWAIT) { /* waited too long.  device failure. */
                                aoedev_downdev(d);
-                               goto tdie;
+                               break;
                        }
                        rexmit(d, f);
                }