aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-thin.c
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2014-03-28 02:15:02 -0400
committerBen Hutchings <ben@decadent.org.uk>2014-04-30 16:23:24 +0100
commit28ba5aaec4a0b118214d2f075456f288f0b67648 (patch)
treebc8e57271fce0ceeaeb36ab5054eaf6f2cf9935a /drivers/md/dm-thin.c
parente6f13570cf414aa151d350e2c2583375a1229b45 (diff)
downloadkernel_samsung_smdk4412-28ba5aaec4a0b118214d2f075456f288f0b67648.zip
kernel_samsung_smdk4412-28ba5aaec4a0b118214d2f075456f288f0b67648.tar.gz
kernel_samsung_smdk4412-28ba5aaec4a0b118214d2f075456f288f0b67648.tar.bz2
dm thin: fix dangling bio in process_deferred_bios error path
commit fe76cd88e654124d1431bb662a0fc6e99ca811a5 upstream. 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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/md/dm-thin.c')
-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 2c9dd2c..80f8bd5 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -1298,9 +1298,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;
}
process_bio(tc, bio);