---

yaml
---
r: 327295
b: refs/heads/master
c: 85a03d1
h: refs/heads/master
i:
  327293: 91931c8
  327291: ecd8bf5
  327287: fc6b281
  327279: 881f98e
  327263: 0aee51d
  327231: 5fca09c
  327167: 647ee45
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 511728d778e8d441e42df68101722548a0c97fe3
+refs/heads/master: 85a03d1bba3b9132adc1aa8f4b8b9e11bac429ec

trunk/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;

trunk/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