Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index d5251edcc0ddd7200a153c547eae40009ee40d04..b21f8e86f1207f9b76bf3e2083fcf72b5062f0b7 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -67,13 +67,6 @@ static int __blk_rq_map_user_iov(struct request *rq,
        bio->bi_opf &= ~REQ_OP_MASK;
        bio->bi_opf |= req_op(rq);
 
        bio->bi_opf &= ~REQ_OP_MASK;
        bio->bi_opf |= req_op(rq);
 

-       if (map_data && map_data->null_mapped)
-               bio_set_flag(bio, BIO_NULL_MAPPED);
-
-       iov_iter_advance(iter, bio->bi_iter.bi_size);
-       if (map_data)
-               map_data->offset += bio->bi_iter.bi_size;
-

        orig_bio = bio;
 
        /*
        orig_bio = bio;
 
        /*