diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-06-16 16:00:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-02 16:50:21 -0700 |
| commit | 8e18616aa5b0fe44435cab215d07148b0d2c6f70 (patch) | |
| tree | 32173567e5a90f0291ed34732080a1cc3a29d1b1 | |
| parent | 2ee1b69073fe86e463160413e289448588d06c78 (diff) | |
md/raid5: add missing call to schedule() after prepare_to_wait()
commit 7a3ab908948b6296ee7e81d42f7c176361c51975 upstream.
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.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 bb37fb1b2d8..c0434e0b72a 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -3696,6 +3696,7 @@ static int make_request(struct request_queue *q, struct bio * bi) spin_unlock_irq(&conf->device_lock); if (must_retry) { release_stripe(sh); + schedule(); goto retry; } } |