From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: "Ed L. Cashin" <ecashin@coraid.com>,
"Ed L. Cashin" <ecashin@coraid.com>,
Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 09/12] aoe: do not stop retransmit timer when device goes down
Date: Thu, 23 Mar 2006 22:10:54 -0800 [thread overview]
Message-ID: <1143180654198-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <1143180654383-git-send-email-gregkh@suse.de>
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>
---
drivers/block/aoe/aoecmd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
1c6f3fcac03a16c901ee5acd58100bff963add6d
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 22bebf8..207aabc 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,
n /= HZ;
if (n > MAXWAIT) { /* waited too long. device failure. */
aoedev_downdev(d);
- goto tdie;
+ break;
}
rexmit(d, f);
}
--
1.2.4
next prev parent reply other threads:[~2006-03-24 6:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-24 6:09 [GIT PATCH] AOE patches for 2.6.16 Greg KH
2006-03-24 6:10 ` [PATCH 01/12] aoe [1/8]: zero packet data after skb allocation Greg KH
2006-03-24 6:10 ` [PATCH 02/12] aoe [2/8]: support dynamic resizing of AoE devices Greg KH
2006-03-24 6:10 ` [PATCH 03/12] aoe [3/8]: increase allowed outstanding packets Greg KH
2006-03-24 6:10 ` [PATCH 04/12] aoe [4/8]: use less confusing driver name Greg KH
2006-03-24 6:10 ` [PATCH 05/12] aoe [5/8]: allow network interface migration on packet retransmit Greg KH
2006-03-24 6:10 ` [PATCH 06/12] aoe [6/8]: update device information on last close Greg KH
2006-03-24 6:10 ` [PATCH 07/12] aoe [7/8]: update driver compatibility string Greg KH
2006-03-24 6:10 ` [PATCH 08/12] aoe [8/8]: update driver version number Greg KH
2006-03-24 6:10 ` Greg KH [this message]
2006-03-24 6:10 ` [PATCH 10/12] aoe [1/3]: support multiple AoE listeners Greg KH
2006-03-24 6:10 ` [PATCH 11/12] aoe [2/3]: don't request ATA device ID on ATA error Greg KH
2006-03-24 6:10 ` [PATCH 12/12] aoe [3/3]: update version to 22 Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1143180654198-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=ecashin@coraid.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox