* [PATCH v2] KEYS: Remove orphan declarations from security/keys/internal.h
@ 2022-09-13 1:46 Gaosheng Cui
2022-09-20 4:49 ` Jarkko Sakkinen
0 siblings, 1 reply; 2+ messages in thread
From: Gaosheng Cui @ 2022-09-13 1:46 UTC (permalink / raw)
To: dhowells, jarkko, paul, jmorris, serge, akpm, alan, cuigaosheng1
Cc: keyrings, linux-security-module
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@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] KEYS: Remove orphan declarations from security/keys/internal.h
2022-09-13 1:46 [PATCH v2] KEYS: Remove orphan declarations from security/keys/internal.h Gaosheng Cui
@ 2022-09-20 4:49 ` Jarkko Sakkinen
0 siblings, 0 replies; 2+ messages in thread
From: Jarkko Sakkinen @ 2022-09-20 4:49 UTC (permalink / raw)
To: Gaosheng Cui
Cc: dhowells, paul, jmorris, serge, akpm, alan, keyrings,
linux-security-module
On Tue, Sep 13, 2022 at 09:46:13AM +0800, Gaosheng Cui wrote:
> 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@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
>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
BR, Jarkko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-20 4:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-13 1:46 [PATCH v2] KEYS: Remove orphan declarations from security/keys/internal.h Gaosheng Cui
2022-09-20 4:49 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).