[RHEL7,COMMIT] ext4: Convert ext4_file_dax_read() into ext4_file_dax_read_iter()

Submitted by Vasily Averin on Aug. 26, 2020, 6:47 a.m.

Details

Message ID 202008260647.07Q6lIt3002328@vz7build.vvs.sw.ru
State New
Series "ext4 read_iter/fastmap: DAX handling"
Headers show

Commit Message

Vasily Averin Aug. 26, 2020, 6:47 a.m.
The commit is pushed to "branch-rh7-3.10.0-1127.18.2.vz7.163.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1127.18.2.vz7.163.11
------>
commit 93853e77a97edc0ffc33bdbedf806a5742333d53
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Wed Aug 26 09:47:18 2020 +0300

    ext4: Convert ext4_file_dax_read() into ext4_file_dax_read_iter()
    
    Patchset description:
    DAX may be enabled directly at mount time, while it's disabled
    by default.
    
    Despite we never enable it, the code must handle this case too
    
    Current patch description:
    Change the type of argument and rename appropriatable.
    
    https://jira.sw.ru/browse/PSBM-105347
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 fs/ext4/file.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 1846544..0ed2641 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -580,16 +580,14 @@  loff_t ext4_llseek(struct file *file, loff_t offset, int whence)
 
 #ifdef CONFIG_FS_DAX
 static ssize_t
-ext4_file_dax_read(
+ext4_file_dax_read_iter(
 	struct kiocb		*iocb,
-	const struct iovec	*iovp,
-	unsigned long		nr_segs,
+	struct iov_iter		*iter,
 	loff_t			pos)
 {
-	size_t			size = iov_length(iovp, nr_segs);
+	size_t			size = iov_iter_count(iter);
 	ssize_t			ret = 0;
 	struct inode *inode = file_inode(iocb->ki_filp);
-	struct iov_iter iter;
 
 	if (!size)
 		return 0; /* skip atime */
@@ -602,12 +600,10 @@  ext4_file_dax_read(
 	if (!IS_DAX(inode)) {
 		inode_unlock(inode);
 		/* Fallback to buffered IO in case we cannot support DAX */
-		return generic_file_aio_read(iocb, iovp, nr_segs, pos);
+		return generic_file_read_iter(iocb, iter, pos);
 	}
 
-	iov_iter_init(&iter, iovp, nr_segs, size, 0);
-
-	ret = dax_iomap_rw(READ, iocb, &iter, pos,
+	ret = dax_iomap_rw(READ, iocb, iter, pos,
 					size, &ext4_iomap_ops);
 	inode_unlock(inode);
 
@@ -623,11 +619,15 @@  ext4_file_read(
 	unsigned long		nr_segs,
 	loff_t 			pos)
 {
+	size_t size = iov_length(iovp, nr_segs);
+	struct iov_iter iter;
+
+	iov_iter_init(&iter, iovp, nr_segs, size, 0);
 #ifdef CONFIG_FS_DAX
 	if (IS_DAX(file_inode(iocb->ki_filp)))
-		return ext4_file_dax_read(iocb, iovp, nr_segs, pos);
+		return ext4_file_dax_read_iter(iocb, &iter, pos);
 #endif
-	return generic_file_aio_read(iocb, iovp, nr_segs, pos);
+	return generic_file_read_iter(iocb, &iter, pos);
 }
 
 const struct file_operations_extend  ext4_file_operations = {