VFS: refactor vfs_read()

integrity_kernel_read() duplicates the file read operations code
in vfs_read(). This patch refactors vfs_read() code creating a
helper function __vfs_read(). It is used by both vfs_read() and
integrity_kernel_read().

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

1 files changed, 18 insertions, 6 deletions

diff --git a/fs/read_write.c b/fs/read_write.c
index 009d8542a889..f45b2ae5d5f1 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -412,6 +412,23 @@ ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *p
 
 EXPORT_SYMBOL(new_sync_read);
 
+ssize_t __vfs_read(struct file *file, char __user *buf, size_t count,
+                   loff_t *pos)
+{
+        ssize_t ret;
+
+        if (file->f_op->read)
+                ret = file->f_op->read(file, buf, count, pos);
+        else if (file->f_op->aio_read)
+                ret = do_sync_read(file, buf, count, pos);
+        else if (file->f_op->read_iter)
+                ret = new_sync_read(file, buf, count, pos);
+        else
+                ret = -EINVAL;
+
+        return ret;
+}
+
 ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
 {
         ssize_t ret;
@@ -426,12 +443,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
         ret = rw_verify_area(READ, file, pos, count);
         if (ret >= 0) {
                 count = ret;
-                if (file->f_op->read)
-                        ret = file->f_op->read(file, buf, count, pos);
-                else if (file->f_op->aio_read)
-                        ret = do_sync_read(file, buf, count, pos);
-                else
-                        ret = new_sync_read(file, buf, count, pos);
+                ret = __vfs_read(file, buf, count, pos);
                 if (ret > 0) {
                         fsnotify_access(file);
                         add_rchar(current, ret);