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

Commit cc508a41 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

xfs: ensure that the inode uid/gid match values match the icdinode ones 



commit 3d8f2821502d0b60bac2789d0bea951fda61de0c upstream.

Instead of only synchronizing the uid/gid values in xfs_setup_inode,
ensure that they always match to prepare for removing the icdinode
fields.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7a9dc797

fs/xfs/libxfs/xfs_inode_buf.c

+2 −0
Original line number Diff line number Diff line
@@ -223,7 +223,9 @@ xfs_inode_from_disk( 


	to->di_format = from->di_format;

	to->di_uid = be32_to_cpu(from->di_uid);

	inode->i_uid = xfs_uid_to_kuid(to->di_uid);

	to->di_gid = be32_to_cpu(from->di_gid);

	inode->i_gid = xfs_gid_to_kgid(to->di_gid);

	to->di_flushiter = be16_to_cpu(from->di_flushiter);



	/*

fs/xfs/xfs_icache.c

+4 −0
Original line number Diff line number Diff line
@@ -289,6 +289,8 @@ xfs_reinit_inode( 
	uint64_t	version = inode_peek_iversion(inode);

	umode_t		mode = inode->i_mode;

	dev_t		dev = inode->i_rdev;

	kuid_t		uid = inode->i_uid;

	kgid_t		gid = inode->i_gid;



	error = inode_init_always(mp->m_super, inode);
@@ -297,6 +299,8 @@ xfs_reinit_inode( 
	inode_set_iversion_queried(inode, version);

	inode->i_mode = mode;

	inode->i_rdev = dev;

	inode->i_uid = uid;

	inode->i_gid = gid;

	return error;

}

fs/xfs/xfs_inode.c

+6 −2
Original line number Diff line number Diff line
@@ -806,15 +806,19 @@ xfs_ialloc( 


	inode->i_mode = mode;

	set_nlink(inode, nlink);

	ip->i_d.di_uid = xfs_kuid_to_uid(current_fsuid());

	ip->i_d.di_gid = xfs_kgid_to_gid(current_fsgid());

	inode->i_uid = current_fsuid();

	ip->i_d.di_uid = xfs_kuid_to_uid(inode->i_uid);

	inode->i_rdev = rdev;

	ip->i_d.di_projid = prid;



	if (pip && XFS_INHERIT_GID(pip)) {

		inode->i_gid = VFS_I(pip)->i_gid;

		ip->i_d.di_gid = pip->i_d.di_gid;

		if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode))

			inode->i_mode |= S_ISGID;

	} else {

		inode->i_gid = current_fsgid();

		ip->i_d.di_gid = xfs_kgid_to_gid(inode->i_gid);

	}



	/*

fs/xfs/xfs_iops.c

+0 −3
Original line number Diff line number Diff line
@@ -1288,9 +1288,6 @@ xfs_setup_inode( 
	/* make the inode look hashed for the writeback code */

	inode_fake_hash(inode);



	inode->i_uid    = xfs_uid_to_kuid(ip->i_d.di_uid);

	inode->i_gid    = xfs_gid_to_kgid(ip->i_d.di_gid);



	i_size_write(inode, ip->i_d.di_size);

	xfs_diflags_to_iflags(inode, ip);