userns: Convert sysfs to use kgid/kuid where appropriate

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c
index feb2d69396cff09c0fb27245a4b04fb767133daf..907c2b3af7589614114a7aa2d91d5969e81d1f6f 100644 (file)
--- a/fs/sysfs/inode.c
+++ b/fs/sysfs/inode.c
@@ -62,8 +62,8 @@ static struct sysfs_inode_attrs *sysfs_init_inode_attrs(struct sysfs_dirent *sd)
 
        /* assign default attributes */
        iattrs->ia_mode = sd->s_mode;
-       iattrs->ia_uid = 0;
-       iattrs->ia_gid = 0;
+       iattrs->ia_uid = GLOBAL_ROOT_UID;
+       iattrs->ia_gid = GLOBAL_ROOT_GID;
        iattrs->ia_atime = iattrs->ia_mtime = iattrs->ia_ctime = CURRENT_TIME;
 
        return attrs;

diff --git a/init/Kconfig b/init/Kconfig
index be587651b952df6de02641dd10857ae42c39d1b7..908e61cd0b0e8832e08c48bb525bfeb473e2cbb6 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -952,7 +952,6 @@ config UIDGID_CONVERTED
        depends on QNX6FS_FS = n
        depends on REISERFS_FS = n
        depends on SQUASHFS = n
-       depends on SYSFS = n
        depends on SYSV_FS = n
        depends on TMPFS = n
        depends on UBIFS_FS = n