Merge branch 'dm-4.12' into dm-4.12-post-merge

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

diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index a5f1916f621a9972449dbbfa2408397484a5d7f3..17ad50daed08ef5022b8648ef2e8701208c85a9d 100644 (file)
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -5,7 +5,7 @@
  */
 
 #include "dm-thin-metadata.h"
-#include "dm-bio-prison.h"
+#include "dm-bio-prison-v1.h"
 #include "dm.h"
 
 #include <linux/device-mapper.h>
@@ -1069,6 +1069,7 @@ static void passdown_endio(struct bio *bio)
         * to unmap (we ignore err).
         */
        queue_passdown_pt2(bio->bi_private);
+       bio_put(bio);
 }
 
 static void process_prepared_discard_passdown_pt1(struct dm_thin_new_mapping *m)