| Date | Sun, 06 Dec 2009 15:59:47 -0800 | From | Greg KH <> | Subject | [011/119] md/raid1/raid10: add a cond_resched |
| |
2.6.31-stable review patch. If anyone has any objections, please let us know.
------------------ From: NeilBrown <neilb@suse.de>
commit 1d9d52416c0445019ccc1f0fddb9a227456eb61b upstream.
During 'check' of a raid1 or raid10 it is possible for the management thread to spend a lot of time running 'memcmp' on blocks from different devices, so make sure the thread has a chance to schedule. raid5d already has a cond_resched (in process_stripe).
Reported-By: Lee Howard <faxguy@howardsilvan.com> Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/md/raid1.c | 1 + drivers/md/raid10.c | 1 + 2 files changed, 2 insertions(+)
--- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1630,6 +1630,7 @@ static void raid10d(mddev_t *mddev) generic_make_request(bio); } } + cond_resched(); } if (unplug) unplug_slaves(mddev); --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1676,6 +1676,7 @@ static void raid1d(mddev_t *mddev) generic_make_request(bio); } } + cond_resched(); } if (unplug) unplug_slaves(mddev);
|