diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-25 20:37:55 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2013-11-26 23:55:33 -0500 |
commit | 261000a56b6382f597bcb12000f55c9ff26a1efb (patch) | |
tree | 5280a6706c24fea298faf82526166c28f86dc1de /include/linux/projid.h | |
parent | 41301ae78a99ead04ea42672a1ab72c6f44cc81d (diff) |
userns: userns: Remove UIDGID_STRICT_TYPE_CHECKS
Removing UIDGID_STRICT_TYPE_CHECKS simplifies the code and always
generates a compile error if the uids and kuids or gids and kgids are
mixed by accident. Now that the appropriate conversions have been
placed throughout the kernel there is no longer a need for a mode where
we don't detect them as compile errors.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'include/linux/projid.h')
-rw-r--r-- | include/linux/projid.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/projid.h b/include/linux/projid.h index 36517b95be5c..8c1f2c55226d 100644 --- a/include/linux/projid.h +++ b/include/linux/projid.h | |||
@@ -18,8 +18,6 @@ extern struct user_namespace init_user_ns; | |||
18 | 18 | ||
19 | typedef __kernel_uid32_t projid_t; | 19 | typedef __kernel_uid32_t projid_t; |
20 | 20 | ||
21 | #ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS | ||
22 | |||
23 | typedef struct { | 21 | typedef struct { |
24 | projid_t val; | 22 | projid_t val; |
25 | } kprojid_t; | 23 | } kprojid_t; |
@@ -31,19 +29,6 @@ static inline projid_t __kprojid_val(kprojid_t projid) | |||
31 | 29 | ||
32 | #define KPROJIDT_INIT(value) (kprojid_t){ value } | 30 | #define KPROJIDT_INIT(value) (kprojid_t){ value } |
33 | 31 | ||
34 | #else | ||
35 | |||
36 | typedef projid_t kprojid_t; | ||
37 | |||
38 | static inline projid_t __kprojid_val(kprojid_t projid) | ||
39 | { | ||
40 | return projid; | ||
41 | } | ||
42 | |||
43 | #define KPROJIDT_INIT(value) ((kprojid_t) value ) | ||
44 | |||
45 | #endif | ||
46 | |||
47 | #define INVALID_PROJID KPROJIDT_INIT(-1) | 32 | #define INVALID_PROJID KPROJIDT_INIT(-1) |
48 | #define OVERFLOW_PROJID 65534 | 33 | #define OVERFLOW_PROJID 65534 |
49 | 34 | ||