userns: Convert efs to use kuid/kgid where appropriate

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/fs/efs/inode.c b/fs/efs/inode.c
index bc84f365d75c3a04516c0f58e57039ca3db8bbb6..f3913eb2c47482739681f51551cd6a325e6fc40d 100644 (file)
--- a/fs/efs/inode.c
+++ b/fs/efs/inode.c
@@ -97,8 +97,8 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino)
     
        inode->i_mode  = be16_to_cpu(efs_inode->di_mode);
        set_nlink(inode, be16_to_cpu(efs_inode->di_nlink));
-       inode->i_uid   = (uid_t)be16_to_cpu(efs_inode->di_uid);
-       inode->i_gid   = (gid_t)be16_to_cpu(efs_inode->di_gid);
+       i_uid_write(inode, (uid_t)be16_to_cpu(efs_inode->di_uid));
+       i_gid_write(inode, (gid_t)be16_to_cpu(efs_inode->di_gid));
        inode->i_size  = be32_to_cpu(efs_inode->di_size);
        inode->i_atime.tv_sec = be32_to_cpu(efs_inode->di_atime);
        inode->i_mtime.tv_sec = be32_to_cpu(efs_inode->di_mtime);

diff --git a/init/Kconfig b/init/Kconfig
index 6120bae29aea044c98cc29a31d6fc83f7038e842..51084b02263f46b8b234ef1c98484190fd34f3ac 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -941,7 +941,6 @@ config UIDGID_CONVERTED
        depends on CEPH_FS = n
        depends on CIFS = n
        depends on CODA_FS = n
-       depends on EFS_FS = n
        depends on EXOFS_FS = n
        depends on FUSE_FS = n
        depends on GFS2_FS = n