From: Michael Halcrow Date: Tue, 16 Oct 2007 08:28:03 +0000 (-0700) Subject: eCryptfs: remove unnecessary variable initializations X-Git-Tag: v2.6.24-rc1~988 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dd8e2902d0c02ee28043071023f8fa6063fe8e8f;p=linux-2.6-omap-h63xx.git 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: Michael Halcrow Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index e9cda7afe6b..a6cbfc16d8a 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -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;