Merge tag 'for-v3.18-rc' of git://git.infradead.org/battery-2.6

[linux-2.6-block.git] / drivers / md / dm-mpath.c

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 833d7e752f0633a1586fcefb613e501d777efb30..7b6b0f0f831a443b0bd947628bca643b821c8b95 100644 (file)
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -317,8 +317,10 @@ static void __choose_pgpath(struct multipath *m, size_t nr_bytes)
        struct priority_group *pg;
        unsigned bypassed = 1;
 
-       if (!m->nr_valid_paths)
+       if (!m->nr_valid_paths) {
+               m->queue_io = 0;
                goto failed;
+       }
 
        /* Were we instructed to switch PG? */
        if (m->next_pg) {