summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-02-10 12:11:12 -0800
committerEric W. Biederman <ebiederm@xmission.com>2012-09-21 03:13:17 -0700
commit511728d778e8d441e42df68101722548a0c97fe3 (patch)
tree2b1fbf00b5ff313912b9f598dafb6c513baa299a
parent80fcbe751f01bea34759bebd3d213c4ee244a719 (diff)
downloadlinux-511728d778e8d441e42df68101722548a0c97fe3.tar.gz
linux-511728d778e8d441e42df68101722548a0c97fe3.tar.bz2
linux-511728d778e8d441e42df68101722548a0c97fe3.zip
userns: Convert the qnx4 filesystem to use kuid/kgid where appropriate
Acked-by: Anders Larsen <al@alarsen.net> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
-rw-r--r--fs/qnx4/inode.c4
-rw-r--r--init/Kconfig1
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index 552e994e3aa1..5c3c7b02e17b 100644
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -312,8 +312,8 @@ struct inode *qnx4_iget(struct super_block *sb, unsigned long ino)
(ino % QNX4_INODES_PER_BLOCK);
inode->i_mode = le16_to_cpu(raw_inode->di_mode);
- inode->i_uid = (uid_t)le16_to_cpu(raw_inode->di_uid);
- inode->i_gid = (gid_t)le16_to_cpu(raw_inode->di_gid);
+ i_uid_write(inode, (uid_t)le16_to_cpu(raw_inode->di_uid));
+ i_gid_write(inode, (gid_t)le16_to_cpu(raw_inode->di_gid));
set_nlink(inode, le16_to_cpu(raw_inode->di_nlink));
inode->i_size = le32_to_cpu(raw_inode->di_size);
inode->i_mtime.tv_sec = le32_to_cpu(raw_inode->di_mtime);
diff --git a/init/Kconfig b/init/Kconfig
index 390e6295b188..b9d6be5ebd70 100644
--- 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 QNX4FS_FS = n
depends on QNX6FS_FS = n
depends on REISERFS_FS = n
depends on SQUASHFS = n