diff options
author | Ed L. Cashin <ecashin@coraid.com> | 2006-01-25 13:54:44 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-24 01:01:56 -0500 |
commit | 1c6f3fcac03a16c901ee5acd58100bff963add6d (patch) | |
tree | 660a4aad0cf58cde710edff305ac852c8c08583f /drivers/block | |
parent | a712c0efbffb09f7b837577e29d0efb043fea0ea (diff) |
[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.c | 4 |
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) | |||
331 | spin_lock_irqsave(&d->lock, flags); | 331 | spin_lock_irqsave(&d->lock, flags); |
332 | 332 | ||
333 | if (d->flags & DEVFL_TKILL) { | 333 | if (d->flags & DEVFL_TKILL) { |
334 | tdie: spin_unlock_irqrestore(&d->lock, flags); | 334 | spin_unlock_irqrestore(&d->lock, flags); |
335 | return; | 335 | return; |
336 | } | 336 | } |
337 | f = d->frames; | 337 | f = d->frames; |
@@ -342,7 +342,7 @@ tdie: spin_unlock_irqrestore(&d->lock, flags); | |||
342 | n /= HZ; | 342 | n /= HZ; |
343 | if (n > MAXWAIT) { /* waited too long. device failure. */ | 343 | if (n > MAXWAIT) { /* waited too long. device failure. */ |
344 | aoedev_downdev(d); | 344 | aoedev_downdev(d); |
345 | goto tdie; | 345 | break; |
346 | } | 346 | } |
347 | rexmit(d, f); | 347 | rexmit(d, f); |
348 | } | 348 | } |