From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 23 Jul 2008 19:05:51 +0000 (-0700)
Subject: md: move async_tx_issue_pending_all outside spin_lock_irq
X-Git-Tag: v2.6.27-rc2~95^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9f21aaff1d1fb5629325130af469532d19beb93;p=linux-2.6

md: move async_tx_issue_pending_all outside spin_lock_irq

Some dma drivers need to call spin_lock_bh in their device_issue_pending
routines.  This change avoids:

WARNING: at kernel/softirq.c:136 local_bh_enable_ip+0x3a/0x85()

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 42a480ba76..8a6f101d32 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3809,10 +3809,8 @@ static void raid5d(mddev_t *mddev)
 
 		sh = __get_priority_stripe(conf);
 
-		if (!sh) {
-			async_tx_issue_pending_all();
+		if (!sh)
 			break;
-		}
 		spin_unlock_irq(&conf->device_lock);
 		
 		handled++;
@@ -3825,6 +3823,7 @@ static void raid5d(mddev_t *mddev)
 
 	spin_unlock_irq(&conf->device_lock);
 
+	async_tx_issue_pending_all();
 	unplug_slaves(mddev);
 
 	pr_debug("--- raid5d inactive\n");