aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuoqing Jiang <gqjiang@suse.com>2017-04-17 05:11:05 -0400
committerShaohua Li <shli@fb.com>2017-04-20 12:55:52 -0400
commitcf25ae78fc50010f66b9be945017796da34c434d (patch)
tree68a4aa1d5cbf900d124db9bc951b1511988b5102
parentfc6d2a3ca59d5656d5b0ac3b25ecf493e4614abd (diff)
md/raid10: wait up frozen array in handle_write_completed
Since nr_queued is changed, we need to call wake_up here if the array is already frozen and waiting for condition "nr_pending == nr_queued + extra" to be true. And commit 824e47daddbf ("RAID1: avoid unnecessary spin locks in I/O barrier code") which has already added the wake_up for raid1. Signed-off-by: Guoqing Jiang <gqjiang@suse.com> Reviewed-by: NeilBrown <neilb@suse.com> Signed-off-by: Shaohua Li <shli@fb.com>
-rw-r--r--drivers/md/raid10.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 4167091eff9a..acb3f46f522f 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -2704,6 +2704,11 @@ static void handle_write_completed(struct r10conf *conf, struct r10bio *r10_bio)
2704 list_add(&r10_bio->retry_list, &conf->bio_end_io_list); 2704 list_add(&r10_bio->retry_list, &conf->bio_end_io_list);
2705 conf->nr_queued++; 2705 conf->nr_queued++;
2706 spin_unlock_irq(&conf->device_lock); 2706 spin_unlock_irq(&conf->device_lock);
2707 /*
2708 * In case freeze_array() is waiting for condition
2709 * nr_pending == nr_queued + extra to be true.
2710 */
2711 wake_up(&conf->wait_barrier);
2707 md_wakeup_thread(conf->mddev->thread); 2712 md_wakeup_thread(conf->mddev->thread);
2708 } else { 2713 } else {
2709 if (test_bit(R10BIO_WriteError, 2714 if (test_bit(R10BIO_WriteError,