summaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-mpath.c
diff options
context:
space:
mode:
authorSteve French <sfrench@hera.kernel.org>2005-06-09 14:44:56 -0700
committerSteve French <sfrench@hera.kernel.org>2005-06-09 14:44:56 -0700
commitf5d9b97ee0d6d00a29bf881263510d74291fb862 (patch)
tree90b22e6038da0ad40e54c3f52e8da67189730ae8 /drivers/md/dm-mpath.c
parent3079ca621e9e09f4593c20a9a2f24237c355f683 (diff)
parentcf380ee7308db0f067ceb2ae8b852838788bf453 (diff)
downloadkernel-crypto-f5d9b97ee0d6d00a29bf881263510d74291fb862.tar.gz
kernel-crypto-f5d9b97ee0d6d00a29bf881263510d74291fb862.tar.xz
kernel-crypto-f5d9b97ee0d6d00a29bf881263510d74291fb862.zip
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/md/dm-mpath.c')
-rw-r--r--drivers/md/dm-mpath.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 1e97b3c12bd..0c1b8520ef8 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -985,6 +985,9 @@ static int do_end_io(struct multipath *m, struct bio *bio,
if (!error)
return 0; /* I/O complete */
+ if ((error == -EWOULDBLOCK) && bio_rw_ahead(bio))
+ return error;
+
spin_lock(&m->lock);
if (!m->nr_valid_paths) {
if (!m->queue_if_no_path || m->suspended) {