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

Commit dd8e2902 authored by Michael Halcrow's avatar Michael Halcrow Committed by Linus Torvalds
Browse files

eCryptfs: remove unnecessary variable initializations 



Andrew Morton wrote:
> >       struct mutex *tfm_mutex = NULL;
>
> This initialisation looks like it's here to kill bogus gcc warning
> (if it is, it should have been commented).  Please investigate
> uninitialized_var() and __maybe_unused sometime.

Remove some unnecessary variable initializations. There may be a few
more such intializations remaining in the code base; a future patch
will take care of those.

Signed-off-by: default avatarMichael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 22e78faf

fs/ecryptfs/keystore.c

+3 −3
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ decrypt_passphrase_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, 
{

	struct scatterlist dst_sg;

	struct scatterlist src_sg;

	struct mutex *tfm_mutex = NULL;

	struct mutex *tfm_mutex;

	struct blkcipher_desc desc = {

		.flags = CRYPTO_TFM_REQ_MAY_SLEEP

	};
@@ -1123,8 +1123,8 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat, 
	size_t found_auth_tok;

	size_t next_packet_is_auth_tok_packet;

	struct list_head auth_tok_list;

	struct ecryptfs_auth_tok *matching_auth_tok = NULL;

	struct ecryptfs_auth_tok *candidate_auth_tok = NULL;

	struct ecryptfs_auth_tok *matching_auth_tok;

	struct ecryptfs_auth_tok *candidate_auth_tok;

	char *candidate_auth_tok_sig;

	size_t packet_size;

	struct ecryptfs_auth_tok *new_auth_tok;