eCryptfs: removed num_global_auth_toks from ecryptfs_mount_crypt_stat
This patch removes the 'num_global_auth_toks' field of the ecryptfs_mount_crypt_stat structure, used to count the number of items in the 'global_auth_tok_list' list. This variable is not needed because there are no checks based upon it. Signed-off-by: Roberto Sassu <roberto.sassu@polito.it> Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
This commit is contained in:
parent
1821df040a
commit
cf35ca6913
@ -266,7 +266,6 @@ void ecryptfs_destroy_mount_crypt_stat(
|
||||
&mount_crypt_stat->global_auth_tok_list,
|
||||
mount_crypt_stat_list) {
|
||||
list_del(&auth_tok->mount_crypt_stat_list);
|
||||
mount_crypt_stat->num_global_auth_toks--;
|
||||
if (auth_tok->global_auth_tok_key
|
||||
&& !(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
|
||||
key_put(auth_tok->global_auth_tok_key);
|
||||
|
@ -378,7 +378,6 @@ struct ecryptfs_mount_crypt_stat {
|
||||
u32 flags;
|
||||
struct list_head global_auth_tok_list;
|
||||
struct mutex global_auth_tok_list_mutex;
|
||||
size_t num_global_auth_toks;
|
||||
size_t global_default_cipher_key_size;
|
||||
size_t global_default_fn_cipher_key_bytes;
|
||||
unsigned char global_default_cipher_name[ECRYPTFS_MAX_CIPHER_NAME_SIZE
|
||||
|
@ -2454,7 +2454,6 @@ ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat,
|
||||
mutex_lock(&mount_crypt_stat->global_auth_tok_list_mutex);
|
||||
list_add(&new_auth_tok->mount_crypt_stat_list,
|
||||
&mount_crypt_stat->global_auth_tok_list);
|
||||
mount_crypt_stat->num_global_auth_toks++;
|
||||
mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex);
|
||||
out:
|
||||
return rc;
|
||||
|
Loading…
Reference in New Issue
Block a user