[PATCH] drivers/md: replace schedule_timeout() with msleep_interruptible()

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 745f7e7bd3ee445f0782285355d811023ae9ca70..10efe7942775bd5366d6f162dc0cc5d7ef215b17 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3468,8 +3468,7 @@ static void md_do_sync(mddev_t *mddev)
                if (currspeed > sysctl_speed_limit_min) {
                        if ((currspeed > sysctl_speed_limit_max) ||
                                        !is_mddev_idle(mddev)) {
-                               current->state = TASK_INTERRUPTIBLE;
-                               schedule_timeout(HZ/4);
+                               msleep_interruptible(250);
                                goto repeat;
                        }
                }

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 1ed82ea4be8ef3aff8205157bee0f7c1e517264c..553e16da088cf375bd3f5197df1ff98c87294c4b 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1013,7 +1013,7 @@ static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
         * put in a delay to throttle resync.
         */
        if (!go_faster && waitqueue_active(&conf->wait_resume))
-               schedule_timeout(HZ);
+               msleep_interruptible(1000);
        device_barrier(conf, sector_nr + RESYNC_SECTORS);
 
        /*

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 6c3fde9ba19235816d2bb9764740a601e7b0b873..0ba3a4e1831c29fb1c235aa760935b22c9f2365d 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1358,7 +1358,7 @@ static int sync_request(mddev_t *mddev, sector_t sector_nr, int go_faster)
         * put in a delay to throttle resync.
         */
        if (!go_faster && waitqueue_active(&conf->wait_resume))
-               schedule_timeout(HZ);
+               msleep_interruptible(1000);
        device_barrier(conf, sector_nr + RESYNC_SECTORS);
 
        /* Again, very different code for resync and recovery.