diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-09 11:48:21 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-15 17:59:28 -0400 |
commit | dcb0f22282e680ee5202ab7574ce78beb3803a9f (patch) | |
tree | dce64929607bc1cc79b08e9c207c27792988ff39 /include/linux | |
parent | 08cefc7ab839cf3ece44b8033968a4732eac06d8 (diff) |
userns: Convert proc to use kuid/kgid where appropriate
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pid_namespace.h | 2 | ||||
-rw-r--r-- | include/linux/proc_fs.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h index b067bd8c49d0..00474b047145 100644 --- a/include/linux/pid_namespace.h +++ b/include/linux/pid_namespace.h | |||
@@ -31,7 +31,7 @@ struct pid_namespace { | |||
31 | #ifdef CONFIG_BSD_PROCESS_ACCT | 31 | #ifdef CONFIG_BSD_PROCESS_ACCT |
32 | struct bsd_acct_struct *bacct; | 32 | struct bsd_acct_struct *bacct; |
33 | #endif | 33 | #endif |
34 | gid_t pid_gid; | 34 | kgid_t pid_gid; |
35 | int hide_pid; | 35 | int hide_pid; |
36 | int reboot; /* group exit code if this pidns was rebooted */ | 36 | int reboot; /* group exit code if this pidns was rebooted */ |
37 | }; | 37 | }; |
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 85c507306239..3fd2e871ff1b 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h | |||
@@ -52,8 +52,8 @@ struct proc_dir_entry { | |||
52 | unsigned int low_ino; | 52 | unsigned int low_ino; |
53 | umode_t mode; | 53 | umode_t mode; |
54 | nlink_t nlink; | 54 | nlink_t nlink; |
55 | uid_t uid; | 55 | kuid_t uid; |
56 | gid_t gid; | 56 | kgid_t gid; |
57 | loff_t size; | 57 | loff_t size; |
58 | const struct inode_operations *proc_iops; | 58 | const struct inode_operations *proc_iops; |
59 | /* | 59 | /* |