Browse Source

eCryptfs: Delete a check before the function call "key_put"

The key_put() function tests whether its argument is NULL and then
returns immediately. Thus the test around this call might not be needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Markus Elfring 10 years ago
parent
commit
0dad87fcb7
1 changed files with 1 additions and 2 deletions
  1. 1 2
      fs/ecryptfs/crypto.c

+ 1 - 2
fs/ecryptfs/crypto.c

@@ -258,8 +258,7 @@ void ecryptfs_destroy_mount_crypt_stat(
 				 &mount_crypt_stat->global_auth_tok_list,
 				 &mount_crypt_stat->global_auth_tok_list,
 				 mount_crypt_stat_list) {
 				 mount_crypt_stat_list) {
 		list_del(&auth_tok->mount_crypt_stat_list);
 		list_del(&auth_tok->mount_crypt_stat_list);
-		if (auth_tok->global_auth_tok_key
-		    && !(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
+		if (!(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
 			key_put(auth_tok->global_auth_tok_key);
 			key_put(auth_tok->global_auth_tok_key);
 		kmem_cache_free(ecryptfs_global_auth_tok_cache, auth_tok);
 		kmem_cache_free(ecryptfs_global_auth_tok_cache, auth_tok);
 	}
 	}