summaryrefslogtreecommitdiff
path: root/drivers/md
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2009-06-16 16:00:33 -0700
committerNeilBrown <neilb@suse.de>2009-06-18 08:50:18 +1000
commit7a3ab908948b6296ee7e81d42f7c176361c51975 (patch)
tree61a066da1bda9af8268bb865e609518be8efd024 /drivers/md
parent495d357301e1de01fabe30ce9a555301fb4675c3 (diff)
downloadlinux-3.10-7a3ab908948b6296ee7e81d42f7c176361c51975.tar.gz
linux-3.10-7a3ab908948b6296ee7e81d42f7c176361c51975.tar.bz2
linux-3.10-7a3ab908948b6296ee7e81d42f7c176361c51975.zip
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 8f2e3740a05..59e29c2983c 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)
spin_unlock_irq(&conf->device_lock);
if (must_retry) {
release_stripe(sh);
+ schedule();
goto retry;
}
}