From 37938463540b075e9166cf774c59274379f7a8ca Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 22 Mar 2014 06:57:37 -0400
Subject: blkdev_aio_read(): switch to generic_file_read_iter(), get rid of
 iov_shorten()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/block_dev.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'fs/block_dev.c')

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 937e3011ed58..b140badb8184 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1538,14 +1538,17 @@ static ssize_t blkdev_aio_read(struct kiocb *iocb, const struct iovec *iov,
 	struct file *file = iocb->ki_filp;
 	struct inode *bd_inode = file->f_mapping->host;
 	loff_t size = i_size_read(bd_inode);
+	size_t count = iocb->ki_nbytes;
+	struct iov_iter to;
+
+	iov_iter_init(&to, READ, iov, nr_segs, count);
 
 	if (pos >= size)
 		return 0;
 
 	size -= pos;
-	if (size < iocb->ki_nbytes)
-		nr_segs = iov_shorten((struct iovec *)iov, nr_segs, size);
-	return generic_file_aio_read(iocb, iov, nr_segs, pos);
+	iov_iter_truncate(&to, size);
+	return generic_file_read_iter(iocb, &to);
 }
 
 /*
-- 
cgit v1.2.2