block: remove management of bi_remaining when restoring original bi_end_io

[karo-tx-linux.git] / drivers / md / dm-thin.c

diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index 342dbdad613181920c8b1c39831d29e4c43a68db..e852602c0091986bfeae804fcd69fe2bc2120992 100644 (file)
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -793,10 +793,9 @@ static void inc_remap_and_issue_cell(struct thin_c *tc,
 
 static void process_prepared_mapping_fail(struct dm_thin_new_mapping *m)
 {
-       if (m->bio) {
+       if (m->bio)
                m->bio->bi_end_io = m->saved_bi_end_io;
-               bio_inc_remaining(m->bio);
-       }
+
        cell_error(m->tc->pool, m->cell);
        list_del(&m->list);
        mempool_free(m, m->tc->pool->mapping_pool);
@@ -810,10 +809,8 @@ static void process_prepared_mapping(struct dm_thin_new_mapping *m)
        int r;
 
        bio = m->bio;
-       if (bio) {
+       if (bio)
                bio->bi_end_io = m->saved_bi_end_io;
-               bio_inc_remaining(bio);
-       }
 
        if (m->err) {
                cell_error(pool, m->cell);