1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3b9b032aa006..d4f31e195e26 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7880,11 +7880,18 @@ void md_do_sync(struct md_thread *thread)
                         /((jiffies-mddev->resync_mark)/HZ +1) +1;
 
                 if (currspeed > speed_min(mddev)) {
-                        if ((currspeed > speed_max(mddev)) ||
-                                        !is_mddev_idle(mddev, 0)) {
+                        if (currspeed > speed_max(mddev)) {
                                 msleep(500);
                                 goto repeat;
                         }
+                        if (!is_mddev_idle(mddev, 0)) {
+                                /*
+                                 * Give other IO more of a chance.
+                                 * The faster the devices, the less we wait.
+                                 */
+                                wait_event(mddev->recovery_wait,
+                                           !atomic_read(&mddev->recovery_active));
+                        }
                 }
         }
         printk(KERN_INFO "md: %s: %s %s.\n",mdname(mddev), desc,