1 files changed, 5 insertions, 16 deletions

diff --git a/include/linux/key.h b/include/linux/key.h
index 83b603639d2e..722914798f37 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -173,10 +173,9 @@ struct key {
 #define KEY_FLAG_NEGATIVE       5       /* set if key is negative */
 #define KEY_FLAG_ROOT_CAN_CLEAR 6       /* set if key can be cleared by root without permission */
 #define KEY_FLAG_INVALIDATED    7       /* set if key has been invalidated */
-#define KEY_FLAG_TRUSTED        8       /* set if key is trusted */
-#define KEY_FLAG_BUILTIN        9       /* set if key is built in to the kernel */
-#define KEY_FLAG_ROOT_CAN_INVAL 10      /* set if key can be invalidated by root without permission */
-#define KEY_FLAG_KEEP           11      /* set if key should not be removed */
+#define KEY_FLAG_BUILTIN        8       /* set if key is built in to the kernel */
+#define KEY_FLAG_ROOT_CAN_INVAL 9       /* set if key can be invalidated by root without permission */
+#define KEY_FLAG_KEEP           10      /* set if key should not be removed */
 
         /* the key type and key description string
          * - the desc is used to match a key against search criteria
@@ -217,7 +216,6 @@ struct key {
          */
         int (*restrict_link)(struct key *keyring,
                              const struct key_type *type,
-                             unsigned long flags,
                              const union key_payload *payload);
 };
 
@@ -229,16 +227,14 @@ extern struct key *key_alloc(struct key_type *type,
                              unsigned long flags,
                              int (*restrict_link)(struct key *,
                                                   const struct key_type *,
-                                                  unsigned long,
                                                   const union key_payload *));
 
 
 #define KEY_ALLOC_IN_QUOTA              0x0000  /* add to quota, reject if would overrun */
 #define KEY_ALLOC_QUOTA_OVERRUN         0x0001  /* add to quota, permit even if overrun */
 #define KEY_ALLOC_NOT_IN_QUOTA          0x0002  /* not in quota */
-#define KEY_ALLOC_TRUSTED               0x0004  /* Key should be flagged as trusted */
-#define KEY_ALLOC_BUILT_IN              0x0008  /* Key is built into kernel */
-#define KEY_ALLOC_BYPASS_RESTRICTION    0x0010  /* Override the check on restricted keyrings */
+#define KEY_ALLOC_BUILT_IN              0x0004  /* Key is built into kernel */
+#define KEY_ALLOC_BYPASS_RESTRICTION    0x0008  /* Override the check on restricted keyrings */
 
 extern void key_revoke(struct key *key);
 extern void key_invalidate(struct key *key);
@@ -309,18 +305,11 @@ extern struct key *keyring_alloc(const char *description, kuid_t uid, kgid_t gid
                                  unsigned long flags,
                                  int (*restrict_link)(struct key *,
                                                       const struct key_type *,
-                                                      unsigned long,
                                                       const union key_payload *),
                                  struct key *dest);
 
-extern int keyring_restrict_trusted_only(struct key *keyring,
-                                         const struct key_type *type,
-                                         unsigned long,
-                                         const union key_payload *payload);
-
 extern int restrict_link_reject(struct key *keyring,
                                 const struct key_type *type,
-                                unsigned long flags,
                                 const union key_payload *payload);
 
 extern int keyring_clear(struct key *keyring);