userns: Convert exofs to use kuid/kgid where appropriate

Cc: Benny Halevy <bhalevy@tonian.com>
Acked-by: Boaz Harrosh <bharrosh@panasas.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c
index 5badb0c039de404b24208c8e6c2041b3331ae5bb..190c3d69e569f511a3b38972fe7337c8c74e161d 100644 (file)
--- a/fs/exofs/inode.c
+++ b/fs/exofs/inode.c
@@ -1163,8 +1163,8 @@ struct inode *exofs_iget(struct super_block *sb, unsigned long ino)
 
        /* copy stuff from on-disk struct to in-memory struct */
        inode->i_mode = le16_to_cpu(fcb.i_mode);
-       inode->i_uid = le32_to_cpu(fcb.i_uid);
-       inode->i_gid = le32_to_cpu(fcb.i_gid);
+       i_uid_write(inode, le32_to_cpu(fcb.i_uid));
+       i_gid_write(inode, le32_to_cpu(fcb.i_gid));
        set_nlink(inode, le16_to_cpu(fcb.i_links_count));
        inode->i_ctime.tv_sec = (signed)le32_to_cpu(fcb.i_ctime);
        inode->i_atime.tv_sec = (signed)le32_to_cpu(fcb.i_atime);
@@ -1376,8 +1376,8 @@ static int exofs_update_inode(struct inode *inode, int do_sync)
        fcb = &args->fcb;
 
        fcb->i_mode = cpu_to_le16(inode->i_mode);
-       fcb->i_uid = cpu_to_le32(inode->i_uid);
-       fcb->i_gid = cpu_to_le32(inode->i_gid);
+       fcb->i_uid = cpu_to_le32(i_uid_read(inode));
+       fcb->i_gid = cpu_to_le32(i_gid_read(inode));
        fcb->i_links_count = cpu_to_le16(inode->i_nlink);
        fcb->i_ctime = cpu_to_le32(inode->i_ctime.tv_sec);
        fcb->i_atime = cpu_to_le32(inode->i_atime.tv_sec);

diff --git a/init/Kconfig b/init/Kconfig
index 51084b02263f46b8b234ef1c98484190fd34f3ac..39e55d614f2c077b4a9fbd26b5d46ebd6a962252 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 EXOFS_FS = n
        depends on FUSE_FS = n
        depends on GFS2_FS = n
        depends on HFS_FS = n