From 675c5d33870eb4257af2bf6f18eb65c478ff5ebc Mon Sep 17 00:00:00 2001
From: Lars Marowsky-Bree <lmb@suse.de>
Date: Wed, 8 Jun 2005 15:50:31 -0700
Subject: [PATCH] --- yaml --- r: 1913 b: refs/heads/master c:
 4f58802fae8a51d9e79454746584175c14f84519 h: refs/heads/master i:   1911:
 3176cf67df774d7468de2618d69237a3dd17ff16 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/md/dm-mpath.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ce3a06a97d71..632ce63db3a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05062d96a23ec0959ee5ea969f40813170c73c0e
+refs/heads/master: 4f58802fae8a51d9e79454746584175c14f84519
diff --git a/trunk/drivers/md/dm-mpath.c b/trunk/drivers/md/dm-mpath.c
index 1e97b3c12bd5..0c1b8520ef86 100644
--- a/trunk/drivers/md/dm-mpath.c
+++ b/trunk/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) {