Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85a03d1b authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

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



Cc: Kai Bankett <chaosman@ontika.net>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent 511728d7

fs/qnx6/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

init/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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