diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/md/raid5.c | |
parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 6497295ebfb..1223e98ecd7 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); |