diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-08 01:29:19 +0100 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 12:13:06 +0200 |
| commit | 9a11f4513c2e308e0025a55b465d377438606445 (patch) | |
| tree | cb28d0f64a5510f3ad7748bd2ab84c8e0cad2e16 | |
| parent | userns: Convert hugetlbfs to use kuid/kgid where appropriate (diff) | |
| download | linux-9a11f4513c2e308e0025a55b465d377438606445.tar.xz linux-9a11f4513c2e308e0025a55b465d377438606445.zip | |
userns: Convert xenfs to use kuid and kgid where appropriate
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
| -rw-r--r-- | drivers/xen/xenfs/super.c | 3 | ||||
| -rw-r--r-- | 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 a84b53c01436..459b9ac45cf5 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 7ee6e19632dd..485c60ae2aed 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 |