commit c5c1de29f810fd34f9e3214bc87b222aa76a2274
author Jens Axboe <axboe@fb.com> Tue Nov 22 08:12:18 2016 -0700
committer Jens Axboe <axboe@fb.com> Tue Nov 22 08:12:18 2016 -0700
tree 3a20ce13436e5865f8f7d77f52b39d0100d3e4bb
parent e4a60d6676b6d9573d4ad29dc0cf4026c3e479f1
parent 4d1a4765426fb57439164089b3cb537ec65356eb

Merge branch 'for-4.10/block' into for-next

fs/block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 35cc494..e49fb79 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -226,7 +226,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
 	bio.bi_max_vecs = nr_pages;
 	bio.bi_io_vec = vecs;
 	bio.bi_bdev = bdev;
-	bio.bi_iter.bi_sector = pos >> blkbits;
+	bio.bi_iter.bi_sector = pos >> 9;
 	bio.bi_private = current;
 	bio.bi_end_io = blkdev_bio_end_io_simple;
 
@@ -358,7 +358,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages)
 
 	for (;;) {
 		bio->bi_bdev = bdev;
-		bio->bi_iter.bi_sector = pos >> blkbits;
+		bio->bi_iter.bi_sector = pos >> 9;
 		bio->bi_private = dio;
 		bio->bi_end_io = blkdev_bio_end_io;