summaryrefslogtreecommitdiffstats
path: root/drivers/md/raid10.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 11:56:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 11:56:07 -0700
commit1e24b15b267293567a8d752721c7ae63f281325a (patch)
treeee63644d2dc59899e42ec0802c201140e3a92e5e /drivers/md/raid10.c
parent63a16f90167850010864a9e8ebb71d216983090f (diff)
parent388667bed591b2359713bb17d5de0cf56e961447 (diff)
downloadop-kernel-dev-1e24b15b267293567a8d752721c7ae63f281325a.zip
op-kernel-dev-1e24b15b267293567a8d752721c7ae63f281325a.tar.gz
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: md: raid10: wake up frozen array md: do not count blocked devices as spares md: do not progress the resync process if the stripe was blocked md: delay notification of 'active_idle' to the recovery thread md: fix merge error md: move async_tx_issue_pending_all outside spin_lock_irq
Diffstat (limited to 'drivers/md/raid10.c')
-rw-r--r--drivers/md/raid10.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 159535d..d41bebb 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -215,6 +215,9 @@ static void reschedule_retry(r10bio_t *r10_bio)
conf->nr_queued ++;
spin_unlock_irqrestore(&conf->device_lock, flags);
+ /* wake up frozen array... */
+ wake_up(&conf->wait_barrier);
+
md_wakeup_thread(mddev->thread);
}
OpenPOWER on IntegriCloud