KEYS: Remove key_type::def_lookup_type

Remove key_type::def_lookup_type as it's no longer used.  The information now
defaults to KEYRING_SEARCH_LOOKUP_DIRECT but may be overridden by
type->match_preparse().

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>

3 files changed, 5 insertions, 9 deletions

diff --git a/security/keys/big_key.c b/security/keys/big_key.c
index c2f91a0cf889..4045c13a761a 100644
--- a/security/keys/big_key.c
+++ b/security/keys/big_key.c
@@ -33,7 +33,6 @@ MODULE_LICENSE("GPL");
  */
 struct key_type key_type_big_key = {
         .name                   = "big_key",
-        .def_lookup_type        = KEYRING_SEARCH_LOOKUP_DIRECT,
         .preparse               = big_key_preparse,
         .free_preparse          = big_key_free_preparse,
         .instantiate            = generic_key_instantiate,
diff --git a/security/keys/internal.h b/security/keys/internal.h
index 805e60b0b87e..b47cc532be1e 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -112,12 +112,11 @@ struct keyring_search_context {
         const struct cred       *cred;
         struct key_match_data   match_data;
         unsigned                flags;
-#define KEYRING_SEARCH_LOOKUP_TYPE      0x0001  /* [as type->def_lookup_type] */
-#define KEYRING_SEARCH_NO_STATE_CHECK   0x0002  /* Skip state checks */
-#define KEYRING_SEARCH_DO_STATE_CHECK   0x0004  /* Override NO_STATE_CHECK */
-#define KEYRING_SEARCH_NO_UPDATE_TIME   0x0008  /* Don't update times */
-#define KEYRING_SEARCH_NO_CHECK_PERM    0x0010  /* Don't check permissions */
-#define KEYRING_SEARCH_DETECT_TOO_DEEP  0x0020  /* Give an error on excessive depth */
+#define KEYRING_SEARCH_NO_STATE_CHECK   0x0001  /* Skip state checks */
+#define KEYRING_SEARCH_DO_STATE_CHECK   0x0002  /* Override NO_STATE_CHECK */
+#define KEYRING_SEARCH_NO_UPDATE_TIME   0x0004  /* Don't update times */
+#define KEYRING_SEARCH_NO_CHECK_PERM    0x0008  /* Don't check permissions */
+#define KEYRING_SEARCH_DETECT_TOO_DEEP  0x0010  /* Give an error on excessive depth */
 
         int (*iterator)(const void *object, void *iterator_data);
 
diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index ec8a56063b02..cd7e726e8646 100644
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c
@@ -26,7 +26,6 @@ static int logon_vet_description(const char *desc);
  */
 struct key_type key_type_user = {
         .name                   = "user",
-        .def_lookup_type        = KEYRING_SEARCH_LOOKUP_DIRECT,
         .preparse               = user_preparse,
         .free_preparse          = user_free_preparse,
         .instantiate            = generic_key_instantiate,
@@ -48,7 +47,6 @@ EXPORT_SYMBOL_GPL(key_type_user);
  */
 struct key_type key_type_logon = {
         .name                   = "logon",
-        .def_lookup_type        = KEYRING_SEARCH_LOOKUP_DIRECT,
         .preparse               = user_preparse,
         .free_preparse          = user_free_preparse,
         .instantiate            = generic_key_instantiate,