diff options
author | Nishanth Aravamudan <nacc@us.ibm.com> | 2005-11-07 04:01:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:57 -0500 |
commit | 66c006a55137cc51f8761549e2024a7593180d27 (patch) | |
tree | 54105f14cc79245f78641e6adb908ff59078e420 | |
parent | 12621a163b78d775a95dea60357bc90e58e1a3aa (diff) |
[PATCH] drivers/md: fix-up schedule_timeout() usage
Use schedule_timeout_interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/md/raid5.c | 3 | ||||
-rw-r--r-- | drivers/md/raid6main.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 6497295ebfb9..1223e98ecd70 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -1587,8 +1587,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i | |||
1587 | /* make sure we don't swamp the stripe cache if someone else | 1587 | /* make sure we don't swamp the stripe cache if someone else |
1588 | * is trying to get access | 1588 | * is trying to get access |
1589 | */ | 1589 | */ |
1590 | set_current_state(TASK_UNINTERRUPTIBLE); | 1590 | schedule_timeout_uninterruptible(1); |
1591 | schedule_timeout(1); | ||
1592 | } | 1591 | } |
1593 | bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 0); | 1592 | bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 0); |
1594 | spin_lock(&sh->lock); | 1593 | spin_lock(&sh->lock); |
diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c index 6437a95ffc1c..775786947701 100644 --- a/drivers/md/raid6main.c +++ b/drivers/md/raid6main.c | |||
@@ -1746,8 +1746,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i | |||
1746 | /* make sure we don't swamp the stripe cache if someone else | 1746 | /* make sure we don't swamp the stripe cache if someone else |
1747 | * is trying to get access | 1747 | * is trying to get access |
1748 | */ | 1748 | */ |
1749 | set_current_state(TASK_UNINTERRUPTIBLE); | 1749 | schedule_timeout_uninterruptible(1); |
1750 | schedule_timeout(1); | ||
1751 | } | 1750 | } |
1752 | bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 0); | 1751 | bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 0); |
1753 | spin_lock(&sh->lock); | 1752 | spin_lock(&sh->lock); |