diff options
Diffstat (limited to 'security/keys/internal.h')
-rw-r--r-- | security/keys/internal.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index 22ff05269e3d..8bbefc3b55d4 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h | |||
@@ -52,8 +52,7 @@ struct key_user { | |||
52 | atomic_t usage; /* for accessing qnkeys & qnbytes */ | 52 | atomic_t usage; /* for accessing qnkeys & qnbytes */ |
53 | atomic_t nkeys; /* number of keys */ | 53 | atomic_t nkeys; /* number of keys */ |
54 | atomic_t nikeys; /* number of instantiated keys */ | 54 | atomic_t nikeys; /* number of instantiated keys */ |
55 | uid_t uid; | 55 | kuid_t uid; |
56 | struct user_namespace *user_ns; | ||
57 | int qnkeys; /* number of keys allocated to this user */ | 56 | int qnkeys; /* number of keys allocated to this user */ |
58 | int qnbytes; /* number of bytes allocated to this user */ | 57 | int qnbytes; /* number of bytes allocated to this user */ |
59 | }; | 58 | }; |
@@ -62,8 +61,7 @@ extern struct rb_root key_user_tree; | |||
62 | extern spinlock_t key_user_lock; | 61 | extern spinlock_t key_user_lock; |
63 | extern struct key_user root_key_user; | 62 | extern struct key_user root_key_user; |
64 | 63 | ||
65 | extern struct key_user *key_user_lookup(uid_t uid, | 64 | extern struct key_user *key_user_lookup(kuid_t uid); |
66 | struct user_namespace *user_ns); | ||
67 | extern void key_user_put(struct key_user *user); | 65 | extern void key_user_put(struct key_user *user); |
68 | 66 | ||
69 | /* | 67 | /* |