diff options
author | Dan Williams <dan.j.williams@intel.com> | 2008-07-23 15:05:51 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2008-07-23 15:05:51 -0400 |
commit | c9f21aaff1d1fb5629325130af469532d19beb93 (patch) | |
tree | 41bb8d2e9d0416d76698d7610b2cbda5ea496cda | |
parent | 4b80991c6cb9efa607bc4fd6f3ecdf5511c31bb0 (diff) |
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>
-rw-r--r-- | drivers/md/raid5.c | 5 |
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) | |||
3809 | 3809 | ||
3810 | sh = __get_priority_stripe(conf); | 3810 | sh = __get_priority_stripe(conf); |
3811 | 3811 | ||
3812 | if (!sh) { | 3812 | if (!sh) |
3813 | async_tx_issue_pending_all(); | ||
3814 | break; | 3813 | break; |
3815 | } | ||
3816 | spin_unlock_irq(&conf->device_lock); | 3814 | spin_unlock_irq(&conf->device_lock); |
3817 | 3815 | ||
3818 | handled++; | 3816 | handled++; |
@@ -3825,6 +3823,7 @@ static void raid5d(mddev_t *mddev) | |||
3825 | 3823 | ||
3826 | spin_unlock_irq(&conf->device_lock); | 3824 | spin_unlock_irq(&conf->device_lock); |
3827 | 3825 | ||
3826 | async_tx_issue_pending_all(); | ||
3828 | unplug_slaves(mddev); | 3827 | unplug_slaves(mddev); |
3829 | 3828 | ||
3830 | pr_debug("--- raid5d inactive\n"); | 3829 | pr_debug("--- raid5d inactive\n"); |