From: Chandan Rajendra <chandan@linux.ibm.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 1/3] xfs: ensure that the inode uid/gid match values match the icdinode ones
Date: Wed, 19 Feb 2020 20:17:59 +0530 [thread overview]
Message-ID: <17408386.h8XSfVsPT9@localhost.localdomain> (raw)
In-Reply-To: <20200218210020.40846-2-hch@lst.de>
On Wednesday, February 19, 2020 2:30 AM Christoph Hellwig wrote:
> Instead of only synchronizing the uid/gid values in xfs_setup_inode,
> ensure that they always match to prepare for removing the icdinode
> fields.
>
The changes indeed keep the uid and gid values the same across icdinode and
vfs inode.
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> 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 8afacfe4be0a..cc4efd34843a 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.c
> +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> @@ -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);
>
> /*
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 8dc2e5414276..a7be7a9e5c1a 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -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;
> }
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index c5077e6326c7..938b0943bd95 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -812,15 +812,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);
> }
>
> /*
> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
> index 81f2f93caec0..b818b261918f 100644
> --- a/fs/xfs/xfs_iops.c
> +++ b/fs/xfs/xfs_iops.c
> @@ -1304,9 +1304,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);
>
>
--
chandan
next prev parent reply other threads:[~2020-02-20 15:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-18 21:00 remove the di_uid/di_gid fields from the XFS icdinode Christoph Hellwig
2020-02-18 21:00 ` [PATCH 1/3] xfs: ensure that the inode uid/gid match values match the icdinode ones Christoph Hellwig
2020-02-19 10:32 ` Carlos Maiolino
2020-02-19 14:26 ` Brian Foster
2020-02-19 14:47 ` Chandan Rajendra [this message]
2020-02-18 21:00 ` [PATCH 2/3] xfs: remove the icdinode di_uid/di_gid members Christoph Hellwig
2020-02-19 10:51 ` Carlos Maiolino
2020-02-19 14:26 ` Brian Foster
2020-02-19 16:25 ` Chandan Rajendra
2020-02-18 21:00 ` [PATCH 3/3] xfs: remove the kuid/kgid conversion wrappers Christoph Hellwig
2020-02-19 11:05 ` Carlos Maiolino
2020-02-19 14:26 ` Brian Foster
2020-02-21 1:26 ` Darrick J. Wong
2020-02-21 15:54 ` Christoph Hellwig
2020-02-21 16:19 ` Darrick J. Wong
2020-02-21 16:29 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17408386.h8XSfVsPT9@localhost.localdomain \
--to=chandan@linux.ibm.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).