diff options
| author | Tejun Heo <tj@kernel.org> | 2015-11-04 01:29:03 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-11-04 01:29:03 +0300 |
| commit | 159b5bb46492e4dcef2070b12861030bc360402b (patch) | |
| tree | 93de7d6e94a059aade50ee5437de6a50ccd1cf7b /fs/ecryptfs/crypto.c | |
| parent | 56e74338a535cbcc2f2da08b1ea1a92920194364 (diff) | |
| parent | 469eabb3aec03d9defed3462df743a223a5c8f54 (diff) | |
| download | linux-159b5bb46492e4dcef2070b12861030bc360402b.tar.xz | |
Merge branch 'for-4.3-fixes' into for-4.4
Diffstat (limited to 'fs/ecryptfs/crypto.c')
| -rw-r--r-- | fs/ecryptfs/crypto.c | 3 |
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); } |