Revert "block, dm: don't copy bios for request clones"

[deliverable/linux.git] / block / bounce.c

diff --git a/block/bounce.c b/block/bounce.c
index ab21ba203d5c7744f4da2afbba85ed45dde86b98..3ab0bce1c947ef9be81f09139aa73d9bd4b76ff5 100644 (file)
--- a/block/bounce.c
+++ b/block/bounce.c
@@ -128,9 +128,6 @@ static void bounce_end_io(struct bio *bio, mempool_t *pool, int err)
        struct bio_vec *bvec, *org_vec;
        int i;
 
-       if (test_bit(BIO_EOPNOTSUPP, &bio->bi_flags))
-               set_bit(BIO_EOPNOTSUPP, &bio_orig->bi_flags);
-
        /*
         * free up bounce indirect pages used
         */
@@ -221,8 +218,8 @@ bounce:
                if (page_to_pfn(page) <= queue_bounce_pfn(q) && !force)
                        continue;
 
-               inc_zone_page_state(to->bv_page, NR_BOUNCE);
                to->bv_page = mempool_alloc(pool, q->bounce_gfp);
+               inc_zone_page_state(to->bv_page, NR_BOUNCE);
 
                if (rw == WRITE) {
                        char *vto, *vfrom;