From 4c702599cd0727493e294c2bbfd577abb8d67e3a Mon Sep 17 00:00:00 2001 From: Mimi Zohar Date: Mon, 5 Oct 2009 14:25:44 -0400 Subject: [PATCH] --- yaml --- r: 167181 b: refs/heads/master c: 36520be8e32b49bd85a63b7b8b40cd07c3da59a5 h: refs/heads/master i: 167179: 89537a19c9146f13d923b6cdee422003c4d9fb14 v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/main.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f201d6c0e28a..202f22b501c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed1f21857e76a92a006e0f890a3d7f72953b1469 +refs/heads/master: 36520be8e32b49bd85a63b7b8b40cd07c3da59a5 diff --git a/trunk/fs/ecryptfs/main.c b/trunk/fs/ecryptfs/main.c index 101fe4c7b1ee..c6ac85d6c701 100644 --- a/trunk/fs/ecryptfs/main.c +++ b/trunk/fs/ecryptfs/main.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "ecryptfs_kernel.h" /** @@ -118,6 +119,7 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry) const struct cred *cred = current_cred(); struct ecryptfs_inode_info *inode_info = ecryptfs_inode_to_private(ecryptfs_dentry->d_inode); + int opened_lower_file = 0; int rc = 0; mutex_lock(&inode_info->lower_file_mutex); @@ -134,9 +136,12 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry) "for lower_dentry [0x%p] and lower_mnt [0x%p]; " "rc = [%d]\n", lower_dentry, lower_mnt, rc); inode_info->lower_file = NULL; - } + } else + opened_lower_file = 1; } mutex_unlock(&inode_info->lower_file_mutex); + if (opened_lower_file) + ima_counts_get(inode_info->lower_file); return rc; }