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

Commit 61293ee2 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

userns: Convert squashfs to use kuid/kgid where appropriate 



Cc: Phillip Lougher <phillip@squashfs.org.uk>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
parent df814654

fs/squashfs/inode.c

+6 −2
Original line number Diff line number Diff line
@@ -56,16 +56,20 @@ 
static int squashfs_new_inode(struct super_block *sb, struct inode *inode,

				struct squashfs_base_inode *sqsh_ino)

{

	uid_t i_uid;

	gid_t i_gid;

	int err;



	err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &inode->i_uid);

	err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &i_uid);

	if (err)

		return err;



	err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->guid), &inode->i_gid);

	err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->guid), &i_gid);

	if (err)

		return err;



	i_uid_write(inode, i_uid);

	i_gid_write(inode, i_gid);

	inode->i_ino = le32_to_cpu(sqsh_ino->inode_number);

	inode->i_mtime.tv_sec = le32_to_cpu(sqsh_ino->mtime);

	inode->i_atime.tv_sec = inode->i_mtime.tv_sec;

init/Kconfig

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

	depends on NFS_FS = n

	depends on OCFS2_FS = n

	depends on SQUASHFS = n

	depends on UBIFS_FS = n

	depends on UDF_FS = n

	depends on UFS_FS = n