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

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@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index 8afacfe4be0a73bfca92801d8e43c93a0cd10407..cc4efd34843aa420a5da0dcd973059e9a2051dac 100644 (file)
--- 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 8dc2e54142768c29fd438b37dce733f02ccae949..a7be7a9e5c1ae09ef9515ce04e6df550587dd32d 100644 (file)
--- 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 c5077e6326c7093d5d1230ece91b37c5bb4d1f53..938b0943bd955712443eca6ec60061fd0328ea90 100644 (file)
--- 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 81f2f93caec0a46655f4949c01efe93914ab06ac..b818b261918f0369b41b14d8b206b1c69041c420 100644 (file)
--- 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);