aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/keystore.c
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2007-10-16 04:28:03 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:11 -0400
commitdd8e2902d0c02ee28043071023f8fa6063fe8e8f (patch)
treed69f643551948c6bc08929759fee4b281b8aa404 /fs/ecryptfs/keystore.c
parent22e78fafbdf84883f70eb4944cf658fc23c4a1f4 (diff)
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 <mhalcrow@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs/keystore.c')
-rw-r--r--fs/ecryptfs/keystore.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index e9cda7afe6be..a6cbfc16d8a4 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,
1009{ 1009{
1010 struct scatterlist dst_sg; 1010 struct scatterlist dst_sg;
1011 struct scatterlist src_sg; 1011 struct scatterlist src_sg;
1012 struct mutex *tfm_mutex = NULL; 1012 struct mutex *tfm_mutex;
1013 struct blkcipher_desc desc = { 1013 struct blkcipher_desc desc = {
1014 .flags = CRYPTO_TFM_REQ_MAY_SLEEP 1014 .flags = CRYPTO_TFM_REQ_MAY_SLEEP
1015 }; 1015 };
@@ -1123,8 +1123,8 @@ int ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat,
1123 size_t found_auth_tok; 1123 size_t found_auth_tok;
1124 size_t next_packet_is_auth_tok_packet; 1124 size_t next_packet_is_auth_tok_packet;
1125 struct list_head auth_tok_list; 1125 struct list_head auth_tok_list;
1126 struct ecryptfs_auth_tok *matching_auth_tok = NULL; 1126 struct ecryptfs_auth_tok *matching_auth_tok;
1127 struct ecryptfs_auth_tok *candidate_auth_tok = NULL; 1127 struct ecryptfs_auth_tok *candidate_auth_tok;
1128 char *candidate_auth_tok_sig; 1128 char *candidate_auth_tok_sig;
1129 size_t packet_size; 1129 size_t packet_size;
1130 struct ecryptfs_auth_tok *new_auth_tok; 1130 struct ecryptfs_auth_tok *new_auth_tok;