From 881f98ee1fd5e88d7a1b4453dedddc3204007ed8 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 7 Feb 2012 16:29:19 -0800 Subject: [PATCH] --- yaml --- r: 327279 b: refs/heads/master c: 9a11f4513c2e308e0025a55b465d377438606445 h: refs/heads/master i: 327277: 60f084477dc27c2cb21e1efbdeac4ba37da62102 327275: b78e56d75473094b3a52e2ca7264cd7a9cc61d88 327271: 6341baded242e56160d37163aa6512d4f289311d 327263: 0aee51d73f54c55a55323452c04fcac9e23376c8 v: v3 --- [refs] | 2 +- trunk/drivers/xen/xenfs/super.c | 3 ++- trunk/init/Kconfig | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a5c02007a1d6..f1ec37c56228 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0eb3a05a8cbe9cd1a41dde3d1b2e5bcc10634f2 +refs/heads/master: 9a11f4513c2e308e0025a55b465d377438606445 diff --git a/trunk/drivers/xen/xenfs/super.c b/trunk/drivers/xen/xenfs/super.c index a84b53c01436..459b9ac45cf5 100644 --- a/trunk/drivers/xen/xenfs/super.c +++ b/trunk/drivers/xen/xenfs/super.c @@ -30,7 +30,8 @@ static struct inode *xenfs_make_inode(struct super_block *sb, int mode) if (ret) { ret->i_mode = mode; - ret->i_uid = ret->i_gid = 0; + ret->i_uid = GLOBAL_ROOT_UID; + ret->i_gid = GLOBAL_ROOT_GID; ret->i_blocks = 0; ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME; } diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 7ee6e19632dd..485c60ae2aed 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -932,8 +932,6 @@ config UIDGID_CONVERTED depends on NET_9P = n # Filesystems - depends on XENFS = n - depends on 9P_FS = n depends on ADFS_FS = n depends on AFFS_FS = n