diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/posix_acl.h | 3 | ||||
-rw-r--r-- | include/linux/projid.h | 15 | ||||
-rw-r--r-- | include/linux/uidgid.h | 22 |
3 files changed, 0 insertions, 40 deletions
diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h index 7931efe71175..f0f7746b2359 100644 --- a/include/linux/posix_acl.h +++ b/include/linux/posix_acl.h | |||
@@ -39,9 +39,6 @@ struct posix_acl_entry { | |||
39 | union { | 39 | union { |
40 | kuid_t e_uid; | 40 | kuid_t e_uid; |
41 | kgid_t e_gid; | 41 | kgid_t e_gid; |
42 | #ifndef CONFIG_UIDGID_STRICT_TYPE_CHECKS | ||
43 | unsigned int e_id; | ||
44 | #endif | ||
45 | }; | 42 | }; |
46 | }; | 43 | }; |
47 | 44 | ||
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 | ||
diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h index 8e522cbcef29..2d1f9b627f91 100644 --- a/include/linux/uidgid.h +++ b/include/linux/uidgid.h | |||
@@ -17,8 +17,6 @@ | |||
17 | struct user_namespace; | 17 | struct user_namespace; |
18 | extern struct user_namespace init_user_ns; | 18 | extern struct user_namespace init_user_ns; |
19 | 19 | ||
20 | #ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS | ||
21 | |||
22 | typedef struct { | 20 | typedef struct { |
23 | uid_t val; | 21 | uid_t val; |
24 | } kuid_t; | 22 | } kuid_t; |
@@ -41,26 +39,6 @@ static inline gid_t __kgid_val(kgid_t gid) | |||
41 | return gid.val; | 39 | return gid.val; |
42 | } | 40 | } |
43 | 41 | ||
44 | #else | ||
45 | |||
46 | typedef uid_t kuid_t; | ||
47 | typedef gid_t kgid_t; | ||
48 | |||
49 | static inline uid_t __kuid_val(kuid_t uid) | ||
50 | { | ||
51 | return uid; | ||
52 | } | ||
53 | |||
54 | static inline gid_t __kgid_val(kgid_t gid) | ||
55 | { | ||
56 | return gid; | ||
57 | } | ||
58 | |||
59 | #define KUIDT_INIT(value) ((kuid_t) value ) | ||
60 | #define KGIDT_INIT(value) ((kgid_t) value ) | ||
61 | |||
62 | #endif | ||
63 | |||
64 | #define GLOBAL_ROOT_UID KUIDT_INIT(0) | 42 | #define GLOBAL_ROOT_UID KUIDT_INIT(0) |
65 | #define GLOBAL_ROOT_GID KGIDT_INIT(0) | 43 | #define GLOBAL_ROOT_GID KGIDT_INIT(0) |
66 | 44 | ||