From 223db41a6778ffa518db3ad5a984ccbf0e258ce6 Mon Sep 17 00:00:00 2001
From: Ed Cashin <ecashin@coraid.com>
Date: Mon, 17 Dec 2012 16:03:47 -0800
Subject: [PATCH] --- yaml --- r: 346477 b: refs/heads/master c:
 0d555ecfa468f6dc29697829844f2f79909e376f h: refs/heads/master i:   346475:
 be3545684d53ba2510ea53e3218f8a5f87fc8603 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/aoe/aoecmd.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f4cf4a71d63f..be481441cb50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2292a7e109d28ffd70ad060b241f9bd2a687dfa0
+refs/heads/master: 0d555ecfa468f6dc29697829844f2f79909e376f
diff --git a/trunk/drivers/block/aoe/aoecmd.c b/trunk/drivers/block/aoe/aoecmd.c
index 6ea27fd8954d..9aefbe3957ca 100644
--- a/trunk/drivers/block/aoe/aoecmd.c
+++ b/trunk/drivers/block/aoe/aoecmd.c
@@ -603,14 +603,14 @@ rexmit_timer(ulong vp)
 
 	d = (struct aoedev *) vp;
 
+	spin_lock_irqsave(&d->lock, flags);
+
 	/* timeout based on observed timings and variations */
 	timeout = 2 * d->rttavg >> RTTSCALE;
 	timeout += 8 * d->rttdev >> RTTDSCALE;
 	if (timeout == 0)
 		timeout = 1;
 
-	spin_lock_irqsave(&d->lock, flags);
-
 	if (d->flags & DEVFL_TKILL) {
 		spin_unlock_irqrestore(&d->lock, flags);
 		return;