summaryrefslogtreecommitdiffstats
path: root/security/keys/internal.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-06-27 11:07:19 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-07-22 23:57:56 +0400
commit67d1214551e800f9fe7dc7c47a346d2df0fafed5 (patch)
treeffcc93af9390339adda36668255e617073b724a1 /security/keys/internal.h
parent158e1645e07f3e9f7e4962d7a0997f5c3b98311b (diff)
downloadop-kernel-dev-67d1214551e800f9fe7dc7c47a346d2df0fafed5.zip
op-kernel-dev-67d1214551e800f9fe7dc7c47a346d2df0fafed5.tar.gz
merge task_work and rcu_head, get rid of separate allocation for keyring case
task_work and rcu_head are identical now; merge them (calling the result struct callback_head, rcu_head #define'd to it), kill separate allocation in security/keys since we can just use cred->rcu now. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/keys/internal.h')
-rw-r--r--security/keys/internal.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h
index b510a31..c246ba5 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -148,12 +148,8 @@ extern key_ref_t lookup_user_key(key_serial_t id, unsigned long flags,
#define KEY_LOOKUP_PARTIAL 0x02
#define KEY_LOOKUP_FOR_UNLINK 0x04
-struct kludge { /* this will die off very soon */
- struct task_work twork;
- struct cred *cred;
-};
extern long join_session_keyring(const char *name);
-extern void key_change_session_keyring(struct task_work *twork);
+extern void key_change_session_keyring(struct callback_head *twork);
extern struct work_struct key_gc_work;
extern unsigned key_gc_delay;
OpenPOWER on IntegriCloud