[PATCH AUTOSEL for 4.9 056/190] md/raid10: wait up frozen array in handle_write_completed

2018-03-07 Thread Sasha Levin
From: Guoqing Jiang 

[ Upstream commit cf25ae78fc50010f66b9be945017796da34c434d ]

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 
Reviewed-by: NeilBrown 
Signed-off-by: Shaohua Li 
Signed-off-by: Sasha Levin 
---
 drivers/md/raid10.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index b19b551bb34b..b1daff78f7b2 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)
list_add(_bio->retry_list, >bio_end_io_list);
conf->nr_queued++;
spin_unlock_irq(>device_lock);
+   /*
+* In case freeze_array() is waiting for condition
+* nr_pending == nr_queued + extra to be true.
+*/
+   wake_up(>wait_barrier);
md_wakeup_thread(conf->mddev->thread);
} else {
if (test_bit(R10BIO_WriteError,
-- 
2.14.1


[PATCH AUTOSEL for 4.9 056/190] md/raid10: wait up frozen array in handle_write_completed

2018-03-07 Thread Sasha Levin
From: Guoqing Jiang 

[ Upstream commit cf25ae78fc50010f66b9be945017796da34c434d ]

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 
Reviewed-by: NeilBrown 
Signed-off-by: Shaohua Li 
Signed-off-by: Sasha Levin 
---
 drivers/md/raid10.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index b19b551bb34b..b1daff78f7b2 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)
list_add(_bio->retry_list, >bio_end_io_list);
conf->nr_queued++;
spin_unlock_irq(>device_lock);
+   /*
+* In case freeze_array() is waiting for condition
+* nr_pending == nr_queued + extra to be true.
+*/
+   wake_up(>wait_barrier);
md_wakeup_thread(conf->mddev->thread);
} else {
if (test_bit(R10BIO_WriteError,
-- 
2.14.1