diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2012-05-25 18:37:55 -0600 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2013-11-26 20:55:33 -0800 |
| commit | 261000a56b6382f597bcb12000f55c9ff26a1efb (patch) | |
| tree | 5280a6706c24fea298faf82526166c28f86dc1de /include/linux/projid.h | |
| parent | vfs: Fix a regression in mounting proc (diff) | |
| download | linux-dev-261000a56b6382f597bcb12000f55c9ff26a1efb.tar.xz linux-dev-261000a56b6382f597bcb12000f55c9ff26a1efb.zip | |
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; typedef __kernel_uid32_t projid_t; -#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS - typedef struct { projid_t val; } kprojid_t; @@ -31,19 +29,6 @@ static inline projid_t __kprojid_val(kprojid_t projid) #define KPROJIDT_INIT(value) (kprojid_t){ value } -#else - -typedef projid_t kprojid_t; - -static inline projid_t __kprojid_val(kprojid_t projid) -{ - return projid; -} - -#define KPROJIDT_INIT(value) ((kprojid_t) value ) - -#endif - #define INVALID_PROJID KPROJIDT_INIT(-1) #define OVERFLOW_PROJID 65534 |