diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-06-16 19:00:33 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2009-06-17 18:50:18 -0400 |
commit | 7a3ab908948b6296ee7e81d42f7c176361c51975 (patch) | |
tree | 61a066da1bda9af8268bb865e609518be8efd024 /drivers/md | |
parent | 495d357301e1de01fabe30ce9a555301fb4675c3 (diff) |
md/raid5: add missing call to schedule() after prepare_to_wait()
In the unlikely event that reshape progresses past the current request
while it is waiting for a stripe we need to schedule() before retrying
for 2 reasons:
1/ Prevent list corruption from duplicated list_add() calls without
intervening list_del().
2/ Give the reshape code a chance to make some progress to resolve the
conflict.
Cc: <stable@kernel.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/raid5.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 8f2e3740a05a..59e29c2983cb 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -3695,6 +3695,7 @@ static int make_request(struct request_queue *q, struct bio * bi) | |||
3695 | spin_unlock_irq(&conf->device_lock); | 3695 | spin_unlock_irq(&conf->device_lock); |
3696 | if (must_retry) { | 3696 | if (must_retry) { |
3697 | release_stripe(sh); | 3697 | release_stripe(sh); |
3698 | schedule(); | ||
3698 | goto retry; | 3699 | goto retry; |
3699 | } | 3700 | } |
3700 | } | 3701 | } |