diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-20 14:30:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-20 14:30:24 +0100 |
| commit | a99598ea9a48f0fcf459bb32a114a9699aa975c8 (patch) | |
| tree | a716ac7e55b1c22cffb820124e7493ac2f8d45f8 /fs/ecryptfs/ecryptfs_kernel.h | |
| parent | b37bdda47743adf2b7f084cd9dcb6ef1f043c164 (diff) | |
| parent | 1f96e0f129eb2bea15a00c154eee8b85aa181d1a (diff) | |
| download | linux-next-a99598ea9a48f0fcf459bb32a114a9699aa975c8.tar.gz | |
Merge remote-tracking branch 'keys/keys-next'
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
| -rw-r--r-- | fs/ecryptfs/ecryptfs_kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index 1c1a56be7ea2..67844fe41a61 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h @@ -91,7 +91,7 @@ ecryptfs_get_encrypted_key_payload_data(struct key *key) static inline struct key *ecryptfs_get_encrypted_key(char *sig) { - return request_key(&key_type_encrypted, sig, NULL); + return request_key(&key_type_encrypted, sig, NULL, NULL); } #else |