userns: Convert devtmpfs to use GLOBAL_ROOT_UID and GLOBAL_ROOT_GID

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index deb4a456cf8365ac3a45480135786c160473964f..147d1a4dd2694eb05a5366cf0a47317eec729479 100644 (file)
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -309,8 +309,8 @@ static int handle_remove(const char *nodename, struct device *dev)
                         * before unlinking this node, reset permissions
                         * of possible references like hardlinks
                         */
-                       newattrs.ia_uid = 0;
-                       newattrs.ia_gid = 0;
+                       newattrs.ia_uid = GLOBAL_ROOT_UID;
+                       newattrs.ia_gid = GLOBAL_ROOT_GID;
                        newattrs.ia_mode = stat.mode & ~0777;
                        newattrs.ia_valid =
                                ATTR_UID|ATTR_GID|ATTR_MODE;

diff --git a/init/Kconfig b/init/Kconfig
index e7e0cc15ef68a75e859719cd28864decc184cd92..96007af6764546c59de53140a4d4d7a372d47ffb 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -932,7 +932,6 @@ config UIDGID_CONVERTED
        depends on NET_9P = n
 
        # Filesystems
-       depends on DEVTMPFS = n
        depends on XENFS = n
 
        depends on 9P_FS = n