1 files changed, 14 insertions, 1 deletions

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index b2ab8489d0e..103304c1e3b 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -34,6 +34,7 @@ struct pgpath {
         unsigned fail_count;            /* Cumulative failure count */
 
         struct dm_path path;
+        struct work_struct deactivate_path;
 };
 
 #define path_to_pgpath(__pgp) container_of((__pgp), struct pgpath, path)
@@ -113,6 +114,7 @@ static struct workqueue_struct *kmultipathd, *kmpath_handlerd;
 static void process_queued_ios(struct work_struct *work);
 static void trigger_event(struct work_struct *work);
 static void activate_path(struct work_struct *work);
+static void deactivate_path(struct work_struct *work);
 
 
 /*-----------------------------------------------
@@ -123,8 +125,10 @@ static struct pgpath *alloc_pgpath(void)
 {
         struct pgpath *pgpath = kzalloc(sizeof(*pgpath), GFP_KERNEL);
 
-        if (pgpath)
+        if (pgpath) {
                 pgpath->is_active = 1;
+                INIT_WORK(&pgpath->deactivate_path, deactivate_path);
+        }
 
         return pgpath;
 }
@@ -134,6 +138,14 @@ static void free_pgpath(struct pgpath *pgpath)
         kfree(pgpath);
 }
 
+static void deactivate_path(struct work_struct *work)
+{
+        struct pgpath *pgpath =
+                container_of(work, struct pgpath, deactivate_path);
+
+        blk_abort_queue(pgpath->path.dev->bdev->bd_disk->queue);
+}
+
 static struct priority_group *alloc_priority_group(void)
 {
         struct priority_group *pg;
@@ -873,6 +885,7 @@ static int fail_path(struct pgpath *pgpath)
                       pgpath->path.dev->name, m->nr_valid_paths);
 
         queue_work(kmultipathd, &m->trigger_event);
+        queue_work(kmultipathd, &pgpath->deactivate_path);
 
 out:
         spin_unlock_irqrestore(&m->lock, flags);