Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull more vfs fixes from Al Viro:
 "Regression fix from Geert + yet another open-coded kernel_read()"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ecryptfs: don't open-code kernel_read()
  xtensa simdisk: Fix proc_create_data() conversion fallout

1 files changed, 1 insertions, 8 deletions

diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
index 6a160539cd23..09fe622274e4 100644
--- a/fs/ecryptfs/read_write.c
+++ b/fs/ecryptfs/read_write.c
@@ -232,17 +232,10 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
                         struct inode *ecryptfs_inode)
 {
         struct file *lower_file;
-        mm_segment_t fs_save;
-        ssize_t rc;
-
         lower_file = ecryptfs_inode_to_private(ecryptfs_inode)->lower_file;
         if (!lower_file)
                 return -EIO;
-        fs_save = get_fs();
-        set_fs(get_ds());
-        rc = vfs_read(lower_file, data, size, &offset);
-        set_fs(fs_save);
-        return rc;
+        return kernel_read(lower_file, offset, data, size);
 }
 
 /**