diff options
author | David Howells <dhowells@redhat.com> | 2006-01-06 00:11:24 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 08:33:29 -0800 |
commit | 8d9067bda99c68e1a17d93e78cf3a5a3f67e0c35 (patch) | |
tree | 6f3c7fe665012c456b57840c290eafd4deabbeb2 /include | |
parent | 32725ad8430b58e42c5d54757ce7871e680d05cb (diff) | |
download | linux-3.10-8d9067bda99c68e1a17d93e78cf3a5a3f67e0c35.tar.gz linux-3.10-8d9067bda99c68e1a17d93e78cf3a5a3f67e0c35.tar.bz2 linux-3.10-8d9067bda99c68e1a17d93e78cf3a5a3f67e0c35.zip |
[PATCH] Keys: Remove key duplication
Remove the key duplication stuff since there's nothing that uses it, no way
to get at it and it's awkward to deal with for LSM purposes.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/keys/user-type.h | 1 | ||||
-rw-r--r-- | include/linux/key.h | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/keys/user-type.h b/include/keys/user-type.h index 26f6ec38577..a3dae1803f4 100644 --- a/include/keys/user-type.h +++ b/include/keys/user-type.h @@ -35,7 +35,6 @@ struct user_key_payload { extern struct key_type key_type_user; extern int user_instantiate(struct key *key, const void *data, size_t datalen); -extern int user_duplicate(struct key *key, const struct key *source); extern int user_update(struct key *key, const void *data, size_t datalen); extern int user_match(const struct key *key, const void *criterion); extern void user_destroy(struct key *key); diff --git a/include/linux/key.h b/include/linux/key.h index 53513a3be53..4d189e51bc6 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -193,14 +193,6 @@ struct key_type { */ int (*instantiate)(struct key *key, const void *data, size_t datalen); - /* duplicate a key of this type (optional) - * - the source key will be locked against change - * - the new description will be attached - * - the quota will have been adjusted automatically from - * source->quotalen - */ - int (*duplicate)(struct key *key, const struct key *source); - /* update a key of this type (optional) * - this method should call key_payload_reserve() to recalculate the * quota consumption |