diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-07 19:28:09 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-18 04:01:37 -0400 |
commit | 69552c0c50f3f950f304fb07a4320e46f7f60c21 (patch) | |
tree | 4c9dba96746a43d632966c2ff30f7ca2e4dd7205 | |
parent | af84df93ffe3603fc6fc40a4338f9e740aad3b4e (diff) |
userns: Convert configfs to use kuid and kgid where appropriate
Cc: Joel Becker <jlbec@evilplan.org>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
-rw-r--r-- | fs/configfs/inode.c | 4 | ||||
-rw-r--r-- | init/Kconfig | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c index 0074362d9f7f..a9d35b0e06cf 100644 --- a/fs/configfs/inode.c +++ b/fs/configfs/inode.c | |||
@@ -79,8 +79,8 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr) | |||
79 | return -ENOMEM; | 79 | return -ENOMEM; |
80 | /* assign default attributes */ | 80 | /* assign default attributes */ |
81 | sd_iattr->ia_mode = sd->s_mode; | 81 | sd_iattr->ia_mode = sd->s_mode; |
82 | sd_iattr->ia_uid = 0; | 82 | sd_iattr->ia_uid = GLOBAL_ROOT_UID; |
83 | sd_iattr->ia_gid = 0; | 83 | sd_iattr->ia_gid = GLOBAL_ROOT_GID; |
84 | sd_iattr->ia_atime = sd_iattr->ia_mtime = sd_iattr->ia_ctime = CURRENT_TIME; | 84 | sd_iattr->ia_atime = sd_iattr->ia_mtime = sd_iattr->ia_ctime = CURRENT_TIME; |
85 | sd->s_iattr = sd_iattr; | 85 | sd->s_iattr = sd_iattr; |
86 | } | 86 | } |
diff --git a/init/Kconfig b/init/Kconfig index ed6310b6042b..33d231cd3cc6 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -950,7 +950,6 @@ config UIDGID_CONVERTED | |||
950 | depends on CEPH_FS = n | 950 | depends on CEPH_FS = n |
951 | depends on CIFS = n | 951 | depends on CIFS = n |
952 | depends on CODA_FS = n | 952 | depends on CODA_FS = n |
953 | depends on CONFIGFS_FS = n | ||
954 | depends on CRAMFS = n | 953 | depends on CRAMFS = n |
955 | depends on ECRYPT_FS = n | 954 | depends on ECRYPT_FS = n |
956 | depends on EFS_FS = n | 955 | depends on EFS_FS = n |