From 69a5f2d666e133f21602ad05594d38fee9f74954 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Sat, 7 Apr 2012 17:58:48 -0700 Subject: [PATCH] --- yaml --- r: 327295 b: refs/heads/master c: 85a03d1bba3b9132adc1aa8f4b8b9e11bac429ec h: refs/heads/master i: 327293: 91931c8d074e2a429e69e81af147c2a08f51d794 327291: ecd8bf5b78e5f357f6e14ba4aef03f746703e99b 327287: fc6b2819763ac921eb9ec5fe0626cb96415ff04c 327279: 881f98ee1fd5e88d7a1b4453dedddc3204007ed8 327263: 0aee51d73f54c55a55323452c04fcac9e23376c8 327231: 5fca09c2e4fc9dd902952ee57035128368b3bd3f 327167: 647ee453280cce1f1a7f4cb9fa6c5d4c531fdbdb v: v3 --- [refs] | 2 +- trunk/fs/qnx6/inode.c | 4 ++-- trunk/init/Kconfig | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7fc341d82663..8f0918c0689a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 511728d778e8d441e42df68101722548a0c97fe3 +refs/heads/master: 85a03d1bba3b9132adc1aa8f4b8b9e11bac429ec diff --git a/trunk/fs/qnx6/inode.c b/trunk/fs/qnx6/inode.c index 2049c814bda4..f4eef0b5e7b5 100644 --- a/trunk/fs/qnx6/inode.c +++ b/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; diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index b9d6be5ebd70..1ff9f4156575 100644 --- a/trunk/init/Kconfig +++ b/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