aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/md/raid1.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 55de4f6f7eaf..0111ff3a81ad 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -901,18 +901,18 @@ static sector_t wait_barrier(struct r1conf *conf, struct bio *bio)
901 * However if there are already pending 901 * However if there are already pending
902 * requests (preventing the barrier from 902 * requests (preventing the barrier from
903 * rising completely), and the 903 * rising completely), and the
904 * pre-process bio queue isn't empty, 904 * per-process bio queue isn't empty,
905 * then don't wait, as we need to empty 905 * then don't wait, as we need to empty
906 * that queue to get the nr_pending 906 * that queue to allow conf->start_next_window
907 * count down. 907 * to increase.
908 */ 908 */
909 wait_event_lock_irq(conf->wait_barrier, 909 wait_event_lock_irq(conf->wait_barrier,
910 !conf->array_frozen && 910 !conf->array_frozen &&
911 (!conf->barrier || 911 (!conf->barrier ||
912 ((conf->start_next_window < 912 ((conf->start_next_window <
913 conf->next_resync + RESYNC_SECTORS) && 913 conf->next_resync + RESYNC_SECTORS) &&
914 current->bio_list && 914 current->bio_list &&
915 !bio_list_empty(current->bio_list))), 915 !bio_list_empty(current->bio_list))),
916 conf->resync_lock); 916 conf->resync_lock);
917 conf->nr_waiting--; 917 conf->nr_waiting--;
918 } 918 }