1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 2ee5e357a0a7..07cfef67c0ba 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -544,8 +544,23 @@ static int multipath_clone_and_map(struct dm_target *ti, struct request *rq,
         return DM_MAPIO_REMAPPED;
 }
 
-static void multipath_release_clone(struct request *clone)
+static void multipath_release_clone(struct request *clone,
+                                    union map_info *map_context)
 {
+        if (unlikely(map_context)) {
+                /*
+                 * non-NULL map_context means caller is still map
+                 * method; must undo multipath_clone_and_map()
+                 */
+                struct dm_mpath_io *mpio = get_mpio(map_context);
+                struct pgpath *pgpath = mpio->pgpath;
+
+                if (pgpath && pgpath->pg->ps.type->end_io)
+                        pgpath->pg->ps.type->end_io(&pgpath->pg->ps,
+                                                    &pgpath->path,
+                                                    mpio->nr_bytes);
+        }
+
         blk_put_request(clone);
 }