summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorEd L. Cashin <ecashin@coraid.com>2006-01-25 21:54:44 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-24 09:01:56 +0300
commit1c6f3fcac03a16c901ee5acd58100bff963add6d (patch)
tree660a4aad0cf58cde710edff305ac852c8c08583f /drivers/block
parenta712c0efbffb09f7b837577e29d0efb043fea0ea (diff)
downloadlinux-1c6f3fcac03a16c901ee5acd58100bff963add6d.tar.xz
[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>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/aoe/aoecmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 22bebf87945c..207aabcd1f4e 100644
--- 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);
}