X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=block%2Fblk-map.c;h=ae4ae1047fd99575473a8b251dff562a151f0719;hb=e290c3434b70b2eb200f9a54d992b7c4fd938879;hp=623e1cd4cffe997e71fbb54577bd42f220af64b3;hpb=eefad7fd53eae2eb8d1e205b1d3a18f67e4e6b46;p=~andy%2Flinux

diff --git a/block/blk-map.c b/block/blk-map.c
index 623e1cd4cff..ae4ae1047fd 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -20,7 +20,7 @@ int blk_rq_append_bio(struct request_queue *q, struct request *rq,
 		rq->biotail->bi_next = bio;
 		rq->biotail = bio;
 
-		rq->__data_len += bio->bi_size;
+		rq->__data_len += bio->bi_iter.bi_size;
 	}
 	return 0;
 }
@@ -76,7 +76,7 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq,
 
 	ret = blk_rq_append_bio(q, rq, bio);
 	if (!ret)
-		return bio->bi_size;
+		return bio->bi_iter.bi_size;
 
 	/* if it was boucned we must call the end io function */
 	bio_endio(bio, 0);
@@ -220,7 +220,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
 	if (IS_ERR(bio))
 		return PTR_ERR(bio);
 
-	if (bio->bi_size != len) {
+	if (bio->bi_iter.bi_size != len) {
 		/*
 		 * Grab an extra reference to this bio, as bio_unmap_user()
 		 * expects to be able to drop it twice as it happens on the