aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2007-02-28 23:12:47 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-01 17:53:37 -0500
commita8d547d5cf3df447d1527f2e66ba578e88011999 (patch)
tree9ecaeed753f0079d09e69bac2b8a93af4ac5fed3 /fs/ecryptfs
parente109ebd1eed2b91e3c9bb3b42cc27961f0dc22b3 (diff)
[PATCH] eCryptfs: set O_LARGEFILE when opening lower file
O_LARGEFILE should be set here when opening the lower file. Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com> Cc: Dmitriy Monakhov <dmonakhov@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/file.c1
-rw-r--r--fs/ecryptfs/inode.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index bd969adf70d7..7a7d25d541e7 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -205,6 +205,7 @@ int ecryptfs_open_lower_file(struct file **lower_file,
205{ 205{
206 int rc = 0; 206 int rc = 0;
207 207
208 flags |= O_LARGEFILE;
208 dget(lower_dentry); 209 dget(lower_dentry);
209 mntget(lower_mnt); 210 mntget(lower_mnt);
210 *lower_file = dentry_open(lower_dentry, lower_mnt, flags); 211 *lower_file = dentry_open(lower_dentry, lower_mnt, flags);
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 9fa7e0b27a96..0cfff4fefa9e 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -200,9 +200,6 @@ static int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry)
200 inode = ecryptfs_dentry->d_inode; 200 inode = ecryptfs_dentry->d_inode;
201 crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat; 201 crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat;
202 lower_flags = ((O_CREAT | O_TRUNC) & O_ACCMODE) | O_RDWR; 202 lower_flags = ((O_CREAT | O_TRUNC) & O_ACCMODE) | O_RDWR;
203#if BITS_PER_LONG != 32
204 lower_flags |= O_LARGEFILE;
205#endif
206 lower_mnt = ecryptfs_dentry_to_lower_mnt(ecryptfs_dentry); 203 lower_mnt = ecryptfs_dentry_to_lower_mnt(ecryptfs_dentry);
207 /* Corresponding fput() at end of this function */ 204 /* Corresponding fput() at end of this function */
208 if ((rc = ecryptfs_open_lower_file(&lower_file, lower_dentry, lower_mnt, 205 if ((rc = ecryptfs_open_lower_file(&lower_file, lower_dentry, lower_mnt,