summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2015-06-26 18:18:54 +0200
committerTyler Hicks <tyhicks@canonical.com>2015-08-18 17:29:49 -0500
commit0dad87fcb732691bfd3183acccda6709e1e759ca (patch)
tree1fdf330c968fa00eb98301d8c7c390005866c7c9 /fs/ecryptfs
parent5556e7e6d30e8e9b5ee51b0e5edd526ee80e5e36 (diff)
downloadlinux-0dad87fcb732691bfd3183acccda6709e1e759ca.tar.gz
linux-0dad87fcb732691bfd3183acccda6709e1e759ca.tar.bz2
linux-0dad87fcb732691bfd3183acccda6709e1e759ca.zip
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>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/crypto.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 97315f2f6816..80d6901493cf 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -258,8 +258,7 @@ void ecryptfs_destroy_mount_crypt_stat(
&mount_crypt_stat->global_auth_tok_list,
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);
kmem_cache_free(ecryptfs_global_auth_tok_cache, auth_tok);
}