---

yaml --- r: 230687 b: refs/heads/master c: 052189a h: refs/heads/master i: 230685: a3e3982 230683: 5362de6 230679: 037cf60 230671: 314a783 230655: 09898ce v: v3
git-mirror · Jan 13, 2011 · c5f6ec4 · c5f6ec4
1 parent 6c558c1
commit c5f6ec4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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))