Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf35ca69 authored by Roberto Sassu's avatar Roberto Sassu Committed by Tyler Hicks
Browse files

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: default avatarRoberto Sassu <roberto.sassu@polito.it>
Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
parent 1821df04

fs/ecryptfs/crypto.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

fs/ecryptfs/ecryptfs_kernel.h

+0 −1
Original line number Diff line number Diff line
@@ -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

fs/ecryptfs/keystore.c

+0 −1
Original line number Diff line number Diff line
@@ -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;