From a99d1935d5d679be261f82d5a5de6ae736eb095f Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 25 Feb 2013 12:38:29 +1100 Subject: [PATCH] --- yaml --- r: 360744 b: refs/heads/master c: ee0b0244030434cdda26777bfb98962447e080cd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid1.c | 1 + trunk/drivers/md/raid10.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e97c535c63ec..20772c45b8b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f96c9f305c24a0d4a075e2c75aa6b417aa238687 +refs/heads/master: ee0b0244030434cdda26777bfb98962447e080cd diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c index 6e5d5a5f9cb4..fd86b372692d 100644 --- a/trunk/drivers/md/raid1.c +++ b/trunk/drivers/md/raid1.c @@ -967,6 +967,7 @@ static void raid1_unplug(struct blk_plug_cb *cb, bool from_schedule) bio_list_merge(&conf->pending_bio_list, &plug->pending); conf->pending_count += plug->pending_cnt; spin_unlock_irq(&conf->device_lock); + wake_up(&conf->wait_barrier); md_wakeup_thread(mddev->thread); kfree(plug); return; diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c index 61ed150bd0cf..77b562d18a90 100644 --- a/trunk/drivers/md/raid10.c +++ b/trunk/drivers/md/raid10.c @@ -1119,6 +1119,7 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule) bio_list_merge(&conf->pending_bio_list, &plug->pending); conf->pending_count += plug->pending_cnt; spin_unlock_irq(&conf->device_lock); + wake_up(&conf->wait_barrier); md_wakeup_thread(mddev->thread); kfree(plug); return;