diff options
-rw-r--r-- | fs/ecryptfs/crypto.c | 2 | ||||
-rw-r--r-- | fs/ecryptfs/super.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index b91851f1cda3..4610fd6afcef 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c | |||
@@ -245,13 +245,11 @@ void ecryptfs_destroy_crypt_stat(struct ecryptfs_crypt_stat *crypt_stat) | |||
245 | crypto_free_blkcipher(crypt_stat->tfm); | 245 | crypto_free_blkcipher(crypt_stat->tfm); |
246 | if (crypt_stat->hash_tfm) | 246 | if (crypt_stat->hash_tfm) |
247 | crypto_free_hash(crypt_stat->hash_tfm); | 247 | crypto_free_hash(crypt_stat->hash_tfm); |
248 | mutex_lock(&crypt_stat->keysig_list_mutex); | ||
249 | list_for_each_entry_safe(key_sig, key_sig_tmp, | 248 | list_for_each_entry_safe(key_sig, key_sig_tmp, |
250 | &crypt_stat->keysig_list, crypt_stat_list) { | 249 | &crypt_stat->keysig_list, crypt_stat_list) { |
251 | list_del(&key_sig->crypt_stat_list); | 250 | list_del(&key_sig->crypt_stat_list); |
252 | kmem_cache_free(ecryptfs_key_sig_cache, key_sig); | 251 | kmem_cache_free(ecryptfs_key_sig_cache, key_sig); |
253 | } | 252 | } |
254 | mutex_unlock(&crypt_stat->keysig_list_mutex); | ||
255 | memset(crypt_stat, 0, sizeof(struct ecryptfs_crypt_stat)); | 253 | memset(crypt_stat, 0, sizeof(struct ecryptfs_crypt_stat)); |
256 | } | 254 | } |
257 | 255 | ||
diff --git a/fs/ecryptfs/super.c b/fs/ecryptfs/super.c index 12d649602d3a..b15a43a80ab7 100644 --- a/fs/ecryptfs/super.c +++ b/fs/ecryptfs/super.c | |||
@@ -77,7 +77,6 @@ static void ecryptfs_destroy_inode(struct inode *inode) | |||
77 | struct ecryptfs_inode_info *inode_info; | 77 | struct ecryptfs_inode_info *inode_info; |
78 | 78 | ||
79 | inode_info = ecryptfs_inode_to_private(inode); | 79 | inode_info = ecryptfs_inode_to_private(inode); |
80 | mutex_lock(&inode_info->lower_file_mutex); | ||
81 | if (inode_info->lower_file) { | 80 | if (inode_info->lower_file) { |
82 | struct dentry *lower_dentry = | 81 | struct dentry *lower_dentry = |
83 | inode_info->lower_file->f_dentry; | 82 | inode_info->lower_file->f_dentry; |
@@ -89,7 +88,6 @@ static void ecryptfs_destroy_inode(struct inode *inode) | |||
89 | d_drop(lower_dentry); | 88 | d_drop(lower_dentry); |
90 | } | 89 | } |
91 | } | 90 | } |
92 | mutex_unlock(&inode_info->lower_file_mutex); | ||
93 | ecryptfs_destroy_crypt_stat(&inode_info->crypt_stat); | 91 | ecryptfs_destroy_crypt_stat(&inode_info->crypt_stat); |
94 | kmem_cache_free(ecryptfs_inode_info_cache, inode_info); | 92 | kmem_cache_free(ecryptfs_inode_info_cache, inode_info); |
95 | } | 93 | } |