1 files changed, 13 insertions, 13 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h
index 46c8602661c9..db99ed434f3a 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -71,26 +71,26 @@ extern void keyring_publish_name(struct key *keyring);
 extern int __key_link(struct key *keyring, struct key *key);
-extern struct key *__keyring_search_one(struct key *keyring,
+extern key_ref_t __keyring_search_one(key_ref_t keyring_ref,
-                                        const struct key_type *type,
+                                      const struct key_type *type,
-                                        const char *description,
+                                      const char *description,
-                                        key_perm_t perm);
+                                      key_perm_t perm);
 extern struct key *keyring_search_instkey(struct key *keyring,
                                          key_serial_t target_id);
 typedef int (*key_match_func_t)(const struct key *, const void *);
-extern struct key *keyring_search_aux(struct key *keyring,
+extern key_ref_t keyring_search_aux(key_ref_t keyring_ref,
-                                      struct task_struct *tsk,
+                                    struct task_struct *tsk,
-                                      struct key_type *type,
+                                    struct key_type *type,
-                                      const void *description,
+                                    const void *description,
-                                      key_match_func_t match);
+                                    key_match_func_t match);
-extern struct key *search_process_keyrings(struct key_type *type,
+extern key_ref_t search_process_keyrings(struct key_type *type,
-                                           const void *description,
+                                         const void *description,
-                                           key_match_func_t match,
+                                         key_match_func_t match,
-                                           struct task_struct *tsk);
+                                         struct task_struct *tsk);
 extern struct key *find_keyring_by_name(const char *name, key_serial_t bound);

diff --git a/security/keys/internal.h b/security/keys/internal.h index 46c8602661c9..db99ed434f3a 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h
@@ -71,26 +71,26 @@ extern void keyring_publish_name(struct key *keyring);
71		71
72	extern int __key_link(struct key keyring, struct key key);	72	extern int __key_link(struct key keyring, struct key key);
73		73
74	extern struct key __keyring_search_one(struct key keyring,	74	extern key_ref_t __keyring_search_one(key_ref_t keyring_ref,
75	const struct key_type *type,	75	const struct key_type *type,
76	const char *description,	76	const char *description,
77	key_perm_t perm);	77	key_perm_t perm);
78		78
79	extern struct key keyring_search_instkey(struct key keyring,	79	extern struct key keyring_search_instkey(struct key keyring,
80	key_serial_t target_id);	80	key_serial_t target_id);
81		81
82	typedef int (key_match_func_t)(const struct key , const void *);	82	typedef int (key_match_func_t)(const struct key , const void *);
83		83
84	extern struct key keyring_search_aux(struct key keyring,	84	extern key_ref_t keyring_search_aux(key_ref_t keyring_ref,
85	struct task_struct *tsk,	85	struct task_struct *tsk,
86	struct key_type *type,	86	struct key_type *type,
87	const void *description,	87	const void *description,
88	key_match_func_t match);	88	key_match_func_t match);
89		89
90	extern struct key search_process_keyrings(struct key_type type,	90	extern key_ref_t search_process_keyrings(struct key_type *type,
91	const void *description,	91	const void *description,
92	key_match_func_t match,	92	key_match_func_t match,
93	struct task_struct *tsk);	93	struct task_struct *tsk);
94		94
95	extern struct key find_keyring_by_name(const char name, key_serial_t bound);	95	extern struct key find_keyring_by_name(const char name, key_serial_t bound);
96		96