From 60f084477dc27c2cb21e1efbdeac4ba37da62102 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Wed, 25 Apr 2012 04:25:35 -0700 Subject: [PATCH] --- yaml --- r: 327277 b: refs/heads/master c: 91fa2ccaa87368314527ea7518c545063662d67f h: refs/heads/master i: 327275: b78e56d75473094b3a52e2ca7264cd7a9cc61d88 v: v3 --- [refs] | 2 +- trunk/drivers/base/devtmpfs.c | 4 ++-- trunk/init/Kconfig | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6a8de102c817..d374e645e537 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9b73f7c4d45d69289aa16620b04430068dd3941 +refs/heads/master: 91fa2ccaa87368314527ea7518c545063662d67f diff --git a/trunk/drivers/base/devtmpfs.c b/trunk/drivers/base/devtmpfs.c index deb4a456cf83..147d1a4dd269 100644 --- a/trunk/drivers/base/devtmpfs.c +++ b/trunk/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/trunk/init/Kconfig b/trunk/init/Kconfig index e7e0cc15ef68..96007af67645 100644 --- a/trunk/init/Kconfig +++ b/trunk/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