eCryptfs: set O_LARGEFILE when opening lower file
PATCH 1/3 eCryptfs: set O_LARGEFILE when opening lower file
Quoted 3 lines · Dmitriy Monakhov
Lets explicitly add
O_LARGEFILEto opened lower file flags as it done in unionfs and nfsd. Also remove unnecessery #define fromecryptfs_initialize_file().
O_LARGEFILE should be set here when opening the lower file.
Signed-off-by Michael Halcrow <[email protected]>
--- fs/ecryptfs/file.c | 1 + fs/ecryptfs/inode.c | 3 --- 2 files changed, 1 insertions(+), 3 deletions(-)
fs/ecryptfs/file.c +1 -0
@@ -205,6 +205,7 @@ int ecryptfs_open_lower_file(struct file **lower_file, {int rc =0 ; + flags |=O_LARGEFILE ;dget (lower_dentry);mntget (lower_mnt); *lower_file =dentry_open (lower_dentry, lower_mnt, flags);
fs/ecryptfs/inode.c +0 -3
@@ -200,9 +200,6 @@ static int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry) inode = ecryptfs_dentry->d_inode; crypt_stat = &ecryptfs_inode_to_private (inode)->crypt_stat; lower_flags = ((O_CREAT |O_TRUNC ) &O_ACCMODE ) |O_RDWR ; -#if BITS_PER_LONG !=32 - lower_flags |=O_LARGEFILE ; -#endif lower_mnt =ecryptfs_dentry_to_lower_mnt (ecryptfs_dentry);/* Corresponding fput() at end of this function */ if ((rc = ecryptfs_open_lower_file(&lower_file, lower_dentry, lower_mnt,
Signature · 1 line
1.4.4.4
PATCH 2/3 eCryptfs: remove unnecessary flush_dcache_page()
Remove unnecessary flush_dcache_page() call. Thanks to Dmitriy Monakhov for pointing this out.
Signed-off-by Michael Halcrow <[email protected]>
--- fs/ecryptfs/mmap.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
fs/ecryptfs/mmap.c +0 -1
@@ -238,7 +238,6 @@ int ecryptfs_do_readpage(struct file *file, struct page *page, lower_page_data =kmap_atomic (lower_page,KM_USER1 );memcpy (page_data, lower_page_data,PAGE_CACHE_SIZE );kunmap_atomic (lower_page_data,KM_USER1 ); -flush_dcache_page (lower_page);kunmap_atomic (page_data,KM_USER0 );flush_dcache_page (page); rc =0 ;
Signature · 1 line
1.4.4.4
PATCH 3/3 eCryptfs: no path_release() after path_lookup() error
In reply to Michael HalcrowQuoted 3 lines · Dmitriy Monakhov
if
path_lookup()return non zero code we don't have to worry about 'nd' parameter, butecryptfs_read_superdoespath_release(&nd)afterpath_lookuphas failed, and dentry counter becomes negative
Do not do a path_release after a path_lookup error.
Signed-off-by Michael Halcrow <[email protected]>
--- fs/ecryptfs/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ecryptfs/main.c +1 -1
@@ -487,7 +487,7 @@ static int ecryptfs_read_super(struct super_block *sb, const char *dev_name) rc =path_lookup (dev_name,LOOKUP_FOLLOW , &nd);if (rc) {ecryptfs_printk (KERN_WARNING ,"path_lookup() failed\n" ); - goto out_free; + goto out; } lower_root = nd.dentry;if (!lower_root->d_inode) {
Signature · 1 line
1.4.4.4