userns: Convert the qnx6 filesystem to use kuid/kgid where appropriate

Cc: Kai Bankett <chaosman@ontika.net>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c
index 2049c814bda475a7e02e9e4411d54cc74f304660..f4eef0b5e7b5203a908ba40f2a4dc88a239a2e4c 100644 (file)
--- a/fs/qnx6/inode.c
+++ b/fs/qnx6/inode.c
@@ -574,8 +574,8 @@ struct inode *qnx6_iget(struct super_block *sb, unsigned ino)
        raw_inode = ((struct qnx6_inode_entry *)page_address(page)) + offs;
 
        inode->i_mode    = fs16_to_cpu(sbi, raw_inode->di_mode);
-       inode->i_uid     = (uid_t)fs32_to_cpu(sbi, raw_inode->di_uid);
-       inode->i_gid     = (gid_t)fs32_to_cpu(sbi, raw_inode->di_gid);
+       i_uid_write(inode, (uid_t)fs32_to_cpu(sbi, raw_inode->di_uid));
+       i_gid_write(inode, (gid_t)fs32_to_cpu(sbi, raw_inode->di_gid));
        inode->i_size    = fs64_to_cpu(sbi, raw_inode->di_size);
        inode->i_mtime.tv_sec   = fs32_to_cpu(sbi, raw_inode->di_mtime);
        inode->i_mtime.tv_nsec = 0;

diff --git a/init/Kconfig b/init/Kconfig
index b9d6be5ebd70b36447eb0a311e3c4173796f73fa..1ff9f4156575728b280fda5667483486b8b424fc 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -950,7 +950,6 @@ config UIDGID_CONVERTED
        depends on NFSD = n
        depends on NFS_FS = n
        depends on OCFS2_FS = n
-       depends on QNX6FS_FS = n
        depends on REISERFS_FS = n
        depends on SQUASHFS = n
        depends on SYSV_FS = n