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

Commit 305d3d0d authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

userns: Convert nillfs2 to use kuid/kgid where appropriate 



Acked-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent f303bdc5

fs/nilfs2/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -401,8 +401,8 @@ int nilfs_read_inode_common(struct inode *inode, 
	int err;



	inode->i_mode = le16_to_cpu(raw_inode->i_mode);

	inode->i_uid = (uid_t)le32_to_cpu(raw_inode->i_uid);

	inode->i_gid = (gid_t)le32_to_cpu(raw_inode->i_gid);

	i_uid_write(inode, le32_to_cpu(raw_inode->i_uid));

	i_gid_write(inode, le32_to_cpu(raw_inode->i_gid));

	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));

	inode->i_size = le64_to_cpu(raw_inode->i_size);

	inode->i_atime.tv_sec = le64_to_cpu(raw_inode->i_mtime);
@@ -590,8 +590,8 @@ void nilfs_write_inode_common(struct inode *inode, 
	struct nilfs_inode_info *ii = NILFS_I(inode);



	raw_inode->i_mode = cpu_to_le16(inode->i_mode);

	raw_inode->i_uid = cpu_to_le32(inode->i_uid);

	raw_inode->i_gid = cpu_to_le32(inode->i_gid);

	raw_inode->i_uid = cpu_to_le32(i_uid_read(inode));

	raw_inode->i_gid = cpu_to_le32(i_gid_read(inode));

	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);

	raw_inode->i_size = cpu_to_le64(inode->i_size);

	raw_inode->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec);

init/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -949,7 +949,6 @@ config UIDGID_CONVERTED 
	depends on NCP_FS = n

	depends on NFSD = n

	depends on NFS_FS = n

	depends on NILFS2_FS = n

	depends on NTFS_FS = n

	depends on OCFS2_FS = n

	depends on OMFS_FS = n