X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fs%2Fdirect-io.c;h=160a5489a93936372c85683ee8cfd6da5185007b;hb=HEAD;hp=0e04142d5962312fcb055738479247b2364a252e;hpb=9451ee2d17e6b4bfbc5871f3c86ea744581b0413;p=~andy%2Flinux

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 0e04142d596..160a5489a93 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -375,7 +375,7 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio,
 	bio = bio_alloc(GFP_KERNEL, nr_vecs);
 
 	bio->bi_bdev = bdev;
-	bio->bi_sector = first_sector;
+	bio->bi_iter.bi_sector = first_sector;
 	if (dio->is_async)
 		bio->bi_end_io = dio_bio_end_aio;
 	else
@@ -719,7 +719,7 @@ static inline int dio_send_cur_page(struct dio *dio, struct dio_submit *sdio,
 	if (sdio->bio) {
 		loff_t cur_offset = sdio->cur_page_fs_offset;
 		loff_t bio_next_offset = sdio->logical_offset_in_bio +
-			sdio->bio->bi_size;
+			sdio->bio->bi_iter.bi_size;
 
 		/*
 		 * See whether this new request is contiguous with the old.