diff options
| author | Michael Halcrow <mhalcrow@us.ibm.com> | 2007-10-16 10:28:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 18:43:11 +0200 |
| commit | dd8e2902d0c02ee28043071023f8fa6063fe8e8f (patch) | |
| tree | d69f643551948c6bc08929759fee4b281b8aa404 /fs/ecryptfs | |
| parent | eCryptfs: kerneldoc fixes for crypto.c and keystore.c (diff) | |
| download | linux-dd8e2902d0c02ee28043071023f8fa6063fe8e8f.tar.xz linux-dd8e2902d0c02ee28043071023f8fa6063fe8e8f.zip | |
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')
| -rw-r--r-- | fs/ecryptfs/keystore.c | 6 |
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, { 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; |