userns: Convert nillfs2 to use kuid/kgid where appropriate

Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index 6e2c3db976b2a8d4b2d5bb6fdd877660fb86b0b7..4d31d2cca7fdc3eaff7643cb67f620bce1cfd069 100644 (file)
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -401,8 +401,8 @@ int nilfs_read_inode_common(struct inode *inode,
        int err;
 
        inode->i_mode = le16_to_cpu(raw_inode->i_mode);
-       inode->i_uid = (uid_t)le32_to_cpu(raw_inode->i_uid);
-       inode->i_gid = (gid_t)le32_to_cpu(raw_inode->i_gid);
+       i_uid_write(inode, le32_to_cpu(raw_inode->i_uid));
+       i_gid_write(inode, le32_to_cpu(raw_inode->i_gid));
        set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
        inode->i_size = le64_to_cpu(raw_inode->i_size);
        inode->i_atime.tv_sec = le64_to_cpu(raw_inode->i_mtime);
@@ -590,8 +590,8 @@ void nilfs_write_inode_common(struct inode *inode,
        struct nilfs_inode_info *ii = NILFS_I(inode);
 
        raw_inode->i_mode = cpu_to_le16(inode->i_mode);
-       raw_inode->i_uid = cpu_to_le32(inode->i_uid);
-       raw_inode->i_gid = cpu_to_le32(inode->i_gid);
+       raw_inode->i_uid = cpu_to_le32(i_uid_read(inode));
+       raw_inode->i_gid = cpu_to_le32(i_gid_read(inode));
        raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
        raw_inode->i_size = cpu_to_le64(inode->i_size);
        raw_inode->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);

diff --git a/init/Kconfig b/init/Kconfig
index c69e085ea810526d85c024e35d12a93169336f1c..90c9e06b66a5f613f7b7c110c40d5016f617d481 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -949,7 +949,6 @@ config UIDGID_CONVERTED
        depends on NCP_FS = n
        depends on NFSD = n
        depends on NFS_FS = n
-       depends on NILFS2_FS = n
        depends on NTFS_FS = n
        depends on OCFS2_FS = n
        depends on OMFS_FS = n