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>

diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index 0074362d9f7faa9518ca2572ee14e8f02946c444..a9d35b0e06cf0be204919aff888f8feff0393724 100644 (file)
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -79,8 +79,8 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
                        return -ENOMEM;
                /* assign default attributes */
                sd_iattr->ia_mode = sd->s_mode;
-               sd_iattr->ia_uid = 0;
-               sd_iattr->ia_gid = 0;
+               sd_iattr->ia_uid = GLOBAL_ROOT_UID;
+               sd_iattr->ia_gid = GLOBAL_ROOT_GID;
                sd_iattr->ia_atime = sd_iattr->ia_mtime = sd_iattr->ia_ctime = CURRENT_TIME;
                sd->s_iattr = sd_iattr;
        }

diff --git a/init/Kconfig b/init/Kconfig
index ed6310b6042be117d8349ba6fb17482789dded7e..33d231cd3cc673a45bbce36ae044aee8715e2f73 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -950,7 +950,6 @@ config UIDGID_CONVERTED
        depends on CEPH_FS = n
        depends on CIFS = n
        depends on CODA_FS = n
-       depends on CONFIGFS_FS = n
        depends on CRAMFS = n
        depends on ECRYPT_FS = n
        depends on EFS_FS = n