From c5f6ec42bd062c4d8329b90befcc32fdf97b2c2d Mon Sep 17 00:00:00 2001
From: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Date: Thu, 13 Jan 2011 20:00:00 +0000
Subject: [PATCH] --- yaml --- r: 230687 b: refs/heads/master c:
 052189a2ec956810feefb6a681416c5e6a207646 h: refs/heads/master i:   230685:
 a3e3982ff503a8226e9fbfa3e0dbb5b2e8126476   230683:
 5362de63ddcea8c2e50958b4333fe01d49f2c75d   230679:
 037cf607c4b6df1c3fb5414d1d199a0ddd53b22e   230671:
 314a78331741a89323f8fdf590801b9d37bfd795   230655:
 09898ce4430afb202c9e3d93dd573857dcf83fdd v: v3

---
 [refs]                | 2 +-
 trunk/drivers/md/dm.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 732e37999aa1..70a16d235d3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbc883f1570d992ba926a8c9e22140ba473c6cc1
+refs/heads/master: 052189a2ec956810feefb6a681416c5e6a207646
diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c
index e504bb40d60e..eaa3af0e0632 100644
--- a/trunk/drivers/md/dm.c
+++ b/trunk/drivers/md/dm.c
@@ -1637,13 +1637,15 @@ static void dm_request_fn(struct request_queue *q)
 		if (map_request(ti, clone, md))
 			goto requeued;
 
-		spin_lock_irq(q->queue_lock);
+		BUG_ON(!irqs_disabled());
+		spin_lock(q->queue_lock);
 	}
 
 	goto out;
 
 requeued:
-	spin_lock_irq(q->queue_lock);
+	BUG_ON(!irqs_disabled());
+	spin_lock(q->queue_lock);
 
 plug_and_out:
 	if (!elv_queue_empty(q))