summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2008-07-23 12:05:51 -0700
committerDan Williams <dan.j.williams@intel.com>2008-07-23 12:05:51 -0700
commitc9f21aaff1d1fb5629325130af469532d19beb93 (patch)
tree41bb8d2e9d0416d76698d7610b2cbda5ea496cda /drivers/md
parent4b80991c6cb9efa607bc4fd6f3ecdf5511c31bb0 (diff)
downloadlinux-c9f21aaff1d1fb5629325130af469532d19beb93.tar.bz2
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>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/raid5.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 42a480ba767b..8a6f101d3225 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");