From 9a11f4513c2e308e0025a55b465d377438606445 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Tue, 7 Feb 2012 16:29:19 -0800 Subject: [PATCH] userns: Convert xenfs to use kuid and kgid where appropriate Cc: Ian Campbell Cc: Konrad Rzeszutek Wilk Acked-by: Serge Hallyn Signed-off-by: Eric W. Biederman --- drivers/xen/xenfs/super.c | 3 ++- init/Kconfig | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/xen/xenfs/super.c b/drivers/xen/xenfs/super.c index a84b53c0143..459b9ac45cf 100644 --- a/drivers/xen/xenfs/super.c +++ b/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/init/Kconfig b/init/Kconfig index 7ee6e19632d..485c60ae2ae 100644 --- a/init/Kconfig +++ b/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