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

Commit 7f5b82b8 authored Apr 25, 2012 by Eric W. Biederman

userns: Convert bfs to use kuid/kgid where appropriate



Cc: "Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

parent 8fed10be

fs/bfs/inode.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -76,8 +76,8 @@ struct inode bfs_iget(struct super_block sb, unsigned long ino)
	BFS_I(inode)->i_sblock = le32_to_cpu(di->i_sblock);		BFS_I(inode)->i_sblock = le32_to_cpu(di->i_sblock);
	BFS_I(inode)->i_eblock = le32_to_cpu(di->i_eblock);		BFS_I(inode)->i_eblock = le32_to_cpu(di->i_eblock);
	BFS_I(inode)->i_dsk_ino = le16_to_cpu(di->i_ino);		BFS_I(inode)->i_dsk_ino = le16_to_cpu(di->i_ino);
	inode->i_uid = le32_to_cpu(di->i_uid);		i_uid_write(inode, le32_to_cpu(di->i_uid));
	inode->i_gid = le32_to_cpu(di->i_gid);		i_gid_write(inode, le32_to_cpu(di->i_gid));
	set_nlink(inode, le32_to_cpu(di->i_nlink));		set_nlink(inode, le32_to_cpu(di->i_nlink));
	inode->i_size = BFS_FILESIZE(di);		inode->i_size = BFS_FILESIZE(di);
	inode->i_blocks = BFS_FILEBLOCKS(di);		inode->i_blocks = BFS_FILEBLOCKS(di);
	@@ -139,8 +139,8 @@ static int bfs_write_inode(struct inode inode, struct writeback_control wbc)

	di->i_ino = cpu_to_le16(ino);		di->i_ino = cpu_to_le16(ino);
	di->i_mode = cpu_to_le32(inode->i_mode);		di->i_mode = cpu_to_le32(inode->i_mode);
	di->i_uid = cpu_to_le32(inode->i_uid);		di->i_uid = cpu_to_le32(i_uid_read(inode));
	di->i_gid = cpu_to_le32(inode->i_gid);		di->i_gid = cpu_to_le32(i_gid_read(inode));
	di->i_nlink = cpu_to_le32(inode->i_nlink);		di->i_nlink = cpu_to_le32(inode->i_nlink);
	di->i_atime = cpu_to_le32(inode->i_atime.tv_sec);		di->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
	di->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec);		di->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec);

init/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -930,7 +930,6 @@ config UIDGID_CONVERTED
	depends on 9P_FS = n		depends on 9P_FS = n
	depends on AFS_FS = n		depends on AFS_FS = n
	depends on AUTOFS4_FS = n		depends on AUTOFS4_FS = n
	depends on BFS_FS = n
	depends on BTRFS_FS = n		depends on BTRFS_FS = n
	depends on CEPH_FS = n		depends on CEPH_FS = n
	depends on CIFS = n		depends on CIFS = n