projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowel...
[linux-2.6-microblaze.git]
/
fs
/
ecryptfs
/
ecryptfs_kernel.h
diff --git
a/fs/ecryptfs/ecryptfs_kernel.h
b/fs/ecryptfs/ecryptfs_kernel.h
index
1c1a56b
..
67844fe
100644
(file)
--- 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