summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-02-10 11:26:34 -0800
committerEric W. Biederman <ebiederm@xmission.com>2012-09-21 03:13:19 -0700
commit2f83ffa874ccb6ea4596220188d3e54b20203124 (patch)
tree81d3e64519863fbc600d588bacfa36c6318d860a
parenta726ecce75896b2045f1646a2d7e31a5562b25a0 (diff)
downloadlinux-stable-2f83ffa874ccb6ea4596220188d3e54b20203124.tar.gz
linux-stable-2f83ffa874ccb6ea4596220188d3e54b20203124.tar.bz2
linux-stable-2f83ffa874ccb6ea4596220188d3e54b20203124.zip
userns: Convert freevxfs to use kuid/kgid where appropriate
Cc: Christoph Hellwig <hch@infradead.org> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
-rw-r--r--fs/freevxfs/vxfs_inode.c4
-rw-r--r--init/Kconfig1
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/freevxfs/vxfs_inode.c b/fs/freevxfs/vxfs_inode.c
index ef67c95f12d4..f47df72cef17 100644
--- a/fs/freevxfs/vxfs_inode.c
+++ b/fs/freevxfs/vxfs_inode.c
@@ -224,8 +224,8 @@ vxfs_iinit(struct inode *ip, struct vxfs_inode_info *vip)
{
ip->i_mode = vxfs_transmod(vip);
- ip->i_uid = (uid_t)vip->vii_uid;
- ip->i_gid = (gid_t)vip->vii_gid;
+ i_uid_write(ip, (uid_t)vip->vii_uid);
+ i_gid_write(ip, (gid_t)vip->vii_gid);
set_nlink(ip, vip->vii_nlink);
ip->i_size = vip->vii_size;
diff --git a/init/Kconfig b/init/Kconfig
index 3427832fb4af..355b1af6932e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -955,7 +955,6 @@ config UIDGID_CONVERTED
depends on UBIFS_FS = n
depends on UDF_FS = n
depends on UFS_FS = n
- depends on VXFS_FS = n
depends on XFS_FS = n
depends on !UML || HOSTFS = n