[SRU Bionic 1/4] xfs: ensure that the inode uid/gid match values match the icdinode ones

[Stefan Bader]

On 16.11.21 20:56, Thadeu Lima de Souza Cascardo wrote:
> From: Christoph Hellwig <hch at lst.de>
> 
> BugLink: https://bugs.launchpad.net/bugs/1950239
> 
> 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: Christoph Hellwig <hch at lst.de>
> Reviewed-by: Darrick J. Wong <darrick.wong at oracle.com>
> Signed-off-by: Darrick J. Wong <darrick.wong at oracle.com>
> (cherry picked from commit 3d8f2821502d0b60bac2789d0bea951fda61de0c)

Was this really a cherry pick for 4.15? If so, it probably could have been a B/F 
combined patch like #4 is...

-Stefan

> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
> ---
>   fs/xfs/libxfs/xfs_inode_buf.c | 2 ++
>   fs/xfs/xfs_icache.c           | 4 ++++
>   fs/xfs/xfs_inode.c            | 8 ++++++--
>   fs/xfs/xfs_iops.c             | 3 ---
>   4 files changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> index eb239cf52eb4..080dced91047 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.c
> +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> @@ -234,7 +234,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);
>   
>   	/*
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index e71f08cc9be4..2d6cc99364db 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -296,6 +296,8 @@ xfs_reinit_inode(
>   	uint64_t	version = inode->i_version;
>   	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);
>   
> @@ -304,6 +306,8 @@ xfs_reinit_inode(
>   	inode->i_version = version;
>   	inode->i_mode = mode;
>   	inode->i_rdev = dev;
> +	inode->i_uid = uid;
> +	inode->i_gid = gid;
>   	return error;
>   }
>   
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index df29a4381482..c9875003fb27 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -796,15 +796,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;
>   	xfs_set_projid(ip, 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);
>   	}
>   
>   	/*
> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
> index 972793e3a4eb..b336d41a9f41 100644
> --- a/fs/xfs/xfs_iops.c
> +++ b/fs/xfs/xfs_iops.c
> @@ -1278,9 +1278,6 @@ xfs_setup_inode(
>   	/* make the inode look hashed for the writeback code */
>   	hlist_add_fake(&inode->i_hash);
>   
> -	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);
>   
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20211119/d5cdad3b/attachment.sig>