aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/ecryptfs/crypto.c1
-rw-r--r--fs/ecryptfs/ecryptfs_kernel.h1
-rw-r--r--fs/ecryptfs/keystore.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 98a2a314ea68..d2a70a4561f9 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -266,7 +266,6 @@ void ecryptfs_destroy_mount_crypt_stat(
266 &mount_crypt_stat->global_auth_tok_list, 266 &mount_crypt_stat->global_auth_tok_list,
267 mount_crypt_stat_list) { 267 mount_crypt_stat_list) {
268 list_del(&auth_tok->mount_crypt_stat_list); 268 list_del(&auth_tok->mount_crypt_stat_list);
269 mount_crypt_stat->num_global_auth_toks--;
270 if (auth_tok->global_auth_tok_key 269 if (auth_tok->global_auth_tok_key
271 && !(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID)) 270 && !(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
272 key_put(auth_tok->global_auth_tok_key); 271 key_put(auth_tok->global_auth_tok_key);
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index 3ef5b0030231..6c6b8261092e 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -378,7 +378,6 @@ struct ecryptfs_mount_crypt_stat {
378 u32 flags; 378 u32 flags;
379 struct list_head global_auth_tok_list; 379 struct list_head global_auth_tok_list;
380 struct mutex global_auth_tok_list_mutex; 380 struct mutex global_auth_tok_list_mutex;
381 size_t num_global_auth_toks;
382 size_t global_default_cipher_key_size; 381 size_t global_default_cipher_key_size;
383 size_t global_default_fn_cipher_key_bytes; 382 size_t global_default_fn_cipher_key_bytes;
384 unsigned char global_default_cipher_name[ECRYPTFS_MAX_CIPHER_NAME_SIZE 383 unsigned char global_default_cipher_name[ECRYPTFS_MAX_CIPHER_NAME_SIZE
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 4feb78c23651..523e51dec66e 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -2454,7 +2454,6 @@ ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat,
2454 mutex_lock(&mount_crypt_stat->global_auth_tok_list_mutex); 2454 mutex_lock(&mount_crypt_stat->global_auth_tok_list_mutex);
2455 list_add(&new_auth_tok->mount_crypt_stat_list, 2455 list_add(&new_auth_tok->mount_crypt_stat_list,
2456 &mount_crypt_stat->global_auth_tok_list); 2456 &mount_crypt_stat->global_auth_tok_list);
2457 mount_crypt_stat->num_global_auth_toks++;
2458 mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex); 2457 mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex);
2459out: 2458out:
2460 return rc; 2459 return rc;