aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/super.c
diff options
context:
space:
mode:
authorThieu Le <thieule@chromium.org>2011-03-08 16:26:03 -0800
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-03-28 01:47:45 -0500
commit57db4e8d73ef2b5e94a3f412108dff2576670a8a (patch)
treeab6eae8e879cfa41cdb3309d8e6a52de14746ca4 /fs/ecryptfs/super.c
parentfed8859b3ab94274c986cbdf7d27130e0545f02c (diff)
downloadkernel_samsung_smdk4412-57db4e8d73ef2b5e94a3f412108dff2576670a8a.zip
kernel_samsung_smdk4412-57db4e8d73ef2b5e94a3f412108dff2576670a8a.tar.gz
kernel_samsung_smdk4412-57db4e8d73ef2b5e94a3f412108dff2576670a8a.tar.bz2
ecryptfs: modify write path to encrypt page in writepage
Change the write path to encrypt the data only when the page is written to disk in ecryptfs_writepage. Previously, ecryptfs encrypts the page in ecryptfs_write_end which means that if there are multiple write requests to the same page, ecryptfs ends up re-encrypting that page over and over again. This patch minimizes the number of encryptions needed. Signed-off-by: Thieu Le <thieule@chromium.org> [tyhicks: Changed NULL .drop_inode sop pointer to generic_drop_inode] Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs/ecryptfs/super.c')
-rw-r--r--fs/ecryptfs/super.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ecryptfs/super.c b/fs/ecryptfs/super.c
index 3042fe1..bacc882 100644
--- a/fs/ecryptfs/super.c
+++ b/fs/ecryptfs/super.c
@@ -55,7 +55,6 @@ static struct inode *ecryptfs_alloc_inode(struct super_block *sb)
if (unlikely(!inode_info))
goto out;
ecryptfs_init_crypt_stat(&inode_info->crypt_stat);
- mutex_init(&inode_info->lower_file_mutex);
inode_info->lower_file = NULL;
inode = &inode_info->vfs_inode;
out:
@@ -198,7 +197,7 @@ static int ecryptfs_show_options(struct seq_file *m, struct vfsmount *mnt)
const struct super_operations ecryptfs_sops = {
.alloc_inode = ecryptfs_alloc_inode,
.destroy_inode = ecryptfs_destroy_inode,
- .drop_inode = generic_delete_inode,
+ .drop_inode = generic_drop_inode,
.statfs = ecryptfs_statfs,
.remount_fs = NULL,
.evict_inode = ecryptfs_evict_inode,