diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 13:44:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 13:44:35 -0700 |
| commit | 07e074503eba3ee657ab50a8c9497ddf90039e7e (patch) | |
| tree | a2599b466e384d638775f99ebd26a88e13c75b90 /fs | |
| parent | 983a5f84a4a11c8706ca70615125db711336b684 (diff) | |
| parent | 39dfe6c6a5ce7defc00f11790efb758954042cea (diff) | |
| download | linux-07e074503eba3ee657ab50a8c9497ddf90039e7e.tar.bz2 | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ecryptfs/read_write.c | 9 |
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); } /** |