[PATCH v2] KEYS: Remove orphan declarations from security/keys/internal.h

Gaosheng Cui cuigaosheng1 at huawei.com
Tue Sep 13 01:46:13 UTC 2022


Remove the following orphan declarations from security/keys/internal.h:
1. request_key_conswq has been removed since
commit 76181c134f87 ("KEYS: Make request_key() and co fundamentally
asynchronous").

2. keyring_search_instkey() has been removed since
commit b5f545c880a2 ("[PATCH] keys: Permit running process to
instantiate keys").

Fixes: 76181c134f87 ("KEYS: Make request_key() and co fundamentally asynchronous").
Fixes: b5f545c880a2 ("[PATCH] keys: Permit running process to instantiate keys").
Signed-off-by: Gaosheng Cui <cuigaosheng1 at huawei.com>
---
v2:
- Format the commit messages for the patchk, thanks!
 security/keys/internal.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/security/keys/internal.h b/security/keys/internal.h
index 9b9cf3b6fcbb..6a2fb45c22f8 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -86,7 +86,6 @@ extern struct kmem_cache *key_jar;
 extern struct rb_root key_serial_tree;
 extern spinlock_t key_serial_lock;
 extern struct mutex key_construction_mutex;
-extern wait_queue_head_t request_key_conswq;
 
 extern void key_set_index_key(struct keyring_index_key *index_key);
 extern struct key_type *key_type_lookup(const char *type);
@@ -109,9 +108,6 @@ extern void __key_link_end(struct key *keyring,
 extern key_ref_t find_key_to_update(key_ref_t keyring_ref,
 				    const struct keyring_index_key *index_key);
 
-extern struct key *keyring_search_instkey(struct key *keyring,
-					  key_serial_t target_id);
-
 extern int iterate_over_keyring(const struct key *keyring,
 				int (*func)(const struct key *key, void *data),
 				void *data);
-- 
2.25.1



More information about the Linux-security-module-archive mailing list