git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched: remove the 'u64 now' parameter from ->dequeue_task()
[safe/jmp/linux-2.6]
/
include
/
linux
/
key.h
diff --git
a/include/linux/key.h
b/include/linux/key.h
index
e693e72
..
a9220e7
100644
(file)
--- a/
include/linux/key.h
+++ b/
include/linux/key.h
@@
-160,6
+160,8
@@
struct key {
*/
union {
struct list_head link;
*/
union {
struct list_head link;
+ unsigned long x[2];
+ void *p[2];
} type_data;
/* key data
} type_data;
/* key data
@@
-177,7
+179,8
@@
struct key {
/*
* kernel managed key type definition
*/
/*
* kernel managed key type definition
*/
-typedef int (*request_key_actor_t)(struct key *key, struct key *authkey, const char *op);
+typedef int (*request_key_actor_t)(struct key *key, struct key *authkey,
+ const char *op, void *aux);
struct key_type {
/* name of the type */
struct key_type {
/* name of the type */
@@
-285,6
+288,11
@@
extern struct key *request_key(struct key_type *type,
const char *description,
const char *callout_info);
const char *description,
const char *callout_info);
+extern struct key *request_key_with_auxdata(struct key_type *type,
+ const char *description,
+ const char *callout_info,
+ void *aux);
+
extern int key_validate(struct key *key);
extern key_ref_t key_create_or_update(key_ref_t keyring,
extern int key_validate(struct key *key);
extern key_ref_t key_create_or_update(key_ref_t keyring,