hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Christoph Hellwig 2020-02-21 08:31:26 -08:00 committed by Darrick J. Wong
parent 93baa55af1
commit 3d8f282150
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/libxfs/xfs_inode_buf.c
View File

@ -223,7 +223,9 @@ xfs_inode_from_disk(
to->di_format = from->di_format; to->di_format = from->di_format;
to->di_uid = be32_to_cpu(from->di_uid); 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); 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); to->di_flushiter = be16_to_cpu(from->di_flushiter);
/* /*

4
fs/xfs/xfs_icache.c
View File

@ -289,6 +289,8 @@ xfs_reinit_inode(
uint64_t version = inode_peek_iversion(inode); uint64_t version = inode_peek_iversion(inode);
umode_t mode = inode->i_mode; umode_t mode = inode->i_mode;
dev_t dev = inode->i_rdev; 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); error = inode_init_always(mp->m_super, inode);
@ -297,6 +299,8 @@ xfs_reinit_inode(
inode_set_iversion_queried(inode, version); inode_set_iversion_queried(inode, version);
inode->i_mode = mode; inode->i_mode = mode;
inode->i_rdev = dev; inode->i_rdev = dev;
inode->i_uid = uid;
inode->i_gid = gid;
return error; return error;
} }

8
fs/xfs/xfs_inode.c
View File

@ -812,15 +812,19 @@ xfs_ialloc(
inode->i_mode = mode; inode->i_mode = mode;
set_nlink(inode, nlink); set_nlink(inode, nlink);
ip->i_d.di_uid = xfs_kuid_to_uid(current_fsuid()); inode->i_uid = current_fsuid();
ip->i_d.di_gid = xfs_kgid_to_gid(current_fsgid()); ip->i_d.di_uid = xfs_kuid_to_uid(inode->i_uid);
inode->i_rdev = rdev; inode->i_rdev = rdev;
ip->i_d.di_projid = prid; ip->i_d.di_projid = prid;
if (pip && XFS_INHERIT_GID(pip)) { if (pip && XFS_INHERIT_GID(pip)) {
inode->i_gid = VFS_I(pip)->i_gid;
ip->i_d.di_gid = pip->i_d.di_gid; ip->i_d.di_gid = pip->i_d.di_gid;
if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode)) if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode))
inode->i_mode |= S_ISGID; inode->i_mode |= S_ISGID;
} else {
inode->i_gid = current_fsgid();
ip->i_d.di_gid = xfs_kgid_to_gid(inode->i_gid);
} }
/* /*

3
fs/xfs/xfs_iops.c
View File

@ -1304,9 +1304,6 @@ xfs_setup_inode(
/* make the inode look hashed for the writeback code */ /* make the inode look hashed for the writeback code */
inode_fake_hash(inode); 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); i_size_write(inode, ip->i_d.di_size);
xfs_diflags_to_iflags(inode, ip); xfs_diflags_to_iflags(inode, ip);