dm: Make rt aware
authorThomas Gleixner <tglx@linutronix.de>
Mon, 14 Nov 2011 22:06:09 +0000 (23:06 +0100)
committerClark Williams <williams@redhat.com>
Wed, 15 Feb 2012 16:33:03 +0000 (10:33 -0600)
Use the BUG_ON_NORT variant for the irq_disabled() checks. RT has
interrupts legitimately enabled here as we cant deadlock against the
irq thread due to the "sleeping spinlocks" conversion.

Reported-by: Luis Claudio R. Goncalves <lclaudio@uudg.org>
Cc: stable-rt@vger.kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
drivers/md/dm.c

index 4720f68f817e66eb1e08da1535512b9cd6455fff..b1eff426c2fc212c064aea9c29f7601014c63ad8 100644 (file)
@@ -1648,14 +1648,14 @@ static void dm_request_fn(struct request_queue *q)
                if (map_request(ti, clone, md))
                        goto requeued;
 
-               BUG_ON(!irqs_disabled());
+               BUG_ON_NONRT(!irqs_disabled());
                spin_lock(q->queue_lock);
        }
 
        goto out;
 
 requeued:
-       BUG_ON(!irqs_disabled());
+       BUG_ON_NONRT(!irqs_disabled());
        spin_lock(q->queue_lock);
 
 delay_and_out: