summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2014-03-28 02:15:02 -0400
committerMike Snitzer <snitzer@redhat.com>2014-03-28 14:37:02 -0400
commitfe76cd88e654124d1431bb662a0fc6e99ca811a5 (patch)
tree27c8b0ae2d86c8ed1acf1ce2df8621ec6b7807f1 /drivers/md
parenta356e42620271deb5afb6570606154d160783bba (diff)
downloadlinux-fe76cd88e654124d1431bb662a0fc6e99ca811a5.tar.gz
linux-fe76cd88e654124d1431bb662a0fc6e99ca811a5.tar.bz2
linux-fe76cd88e654124d1431bb662a0fc6e99ca811a5.zip
dm thin: fix dangling bio in process_deferred_bios error path
If unable to ensure_next_mapping() we must add the current bio, which was removed from the @bios list via bio_list_pop, back to the deferred_bios list before all the remaining @bios. Signed-off-by: Mike Snitzer <snitzer@redhat.com> Acked-by: Joe Thornber <ejt@redhat.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/dm-thin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index be70d38745f7..60cc50685c14 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -1392,9 +1392,9 @@ static void process_deferred_bios(struct pool *pool)
*/
if (ensure_next_mapping(pool)) {
spin_lock_irqsave(&pool->lock, flags);
+ bio_list_add(&pool->deferred_bios, bio);
bio_list_merge(&pool->deferred_bios, &bios);
spin_unlock_irqrestore(&pool->lock, flags);
-
break;
}