diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-02-10 14:26:34 -0500 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-09-21 06:13:19 -0400 |
commit | 2f83ffa874ccb6ea4596220188d3e54b20203124 (patch) | |
tree | 81d3e64519863fbc600d588bacfa36c6318d860a | |
parent | a726ecce75896b2045f1646a2d7e31a5562b25a0 (diff) |
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.c | 4 | ||||
-rw-r--r-- | init/Kconfig | 1 |
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) | |||
224 | { | 224 | { |
225 | 225 | ||
226 | ip->i_mode = vxfs_transmod(vip); | 226 | ip->i_mode = vxfs_transmod(vip); |
227 | ip->i_uid = (uid_t)vip->vii_uid; | 227 | i_uid_write(ip, (uid_t)vip->vii_uid); |
228 | ip->i_gid = (gid_t)vip->vii_gid; | 228 | i_gid_write(ip, (gid_t)vip->vii_gid); |
229 | 229 | ||
230 | set_nlink(ip, vip->vii_nlink); | 230 | set_nlink(ip, vip->vii_nlink); |
231 | ip->i_size = vip->vii_size; | 231 | 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 | |||
955 | depends on UBIFS_FS = n | 955 | depends on UBIFS_FS = n |
956 | depends on UDF_FS = n | 956 | depends on UDF_FS = n |
957 | depends on UFS_FS = n | 957 | depends on UFS_FS = n |
958 | depends on VXFS_FS = n | ||
959 | depends on XFS_FS = n | 958 | depends on XFS_FS = n |
960 | 959 | ||
961 | depends on !UML || HOSTFS = n | 960 | depends on !UML || HOSTFS = n |