From 26419d87fee9d853214357af8abdc8ce7f19c4eb Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 18 Oct 2004 18:22:40 -0700 Subject: [PATCH] [PATCH] drivers/md: replace schedule_timeout() with msleep_interruptible() Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/md/md.c | 3 +-- drivers/md/raid1.c | 2 +- drivers/md/raid10.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 745f7e7bd3ee4..10efe7942775b 100644 --- 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 1ed82ea4be8ef..553e16da088cf 100644 --- 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 6c3fde9ba1923..0ba3a4e1831c2 100644 --- 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. -- 2.53.0