GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 14:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xfs: move the di_forkoff field to struct xfs_inode

Browse source 
In preparation of removing the historic icinode struct, move the
forkoff field into the containing xfs_inode structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Christoph Hellwig 2021-03-29 11:11:44 -07:00 • committed by Darrick J. Wong
parent ee7b83fd36
commit 7821ea302d
9 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fs/xfs/xfs_inode.c
View file

@ -885,7 +885,7 @@ xfs_init_new_inode(
* fork offset in the immediate future.
*/
if (init_xattrs) {
ip->i_d.di_forkoff = xfs_default_attroffset(ip) >> 3;
ip->i_forkoff = xfs_default_attroffset(ip) >> 3;
ip->i_afp = xfs_ifork_alloc(XFS_DINODE_FMT_EXTENTS, 0);
}
@ -1764,7 +1764,7 @@ xfs_inactive(
}
ASSERT(!ip->i_afp);
ASSERT(ip->i_d.di_forkoff == 0);
ASSERT(ip->i_forkoff == 0);
/*
* Free the inode.
@ -2613,7 +2613,7 @@ xfs_ifree(
VFS_I(ip)->i_mode = 0; /* mark incore inode as free */
ip->i_d.di_flags = 0;
ip->i_d.di_flags2 = ip->i_mount->m_ino_geo.new_diflags2;
ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */
ip->i_forkoff = 0; /* mark the attr fork not in use */
ip->i_df.if_format = XFS_DINODE_FMT_EXTENTS;
if (xfs_iflags_test(ip, XFS_IPRESERVE_DM_FIELDS))
xfs_iflags_clear(ip, XFS_IPRESERVE_DM_FIELDS);
@ -3445,11 +3445,11 @@ xfs_iflush(
ip->i_nblocks, ip);
goto flush_out;
}
if (XFS_TEST_ERROR(ip->i_d.di_forkoff > mp->m_sb.sb_inodesize,
if (XFS_TEST_ERROR(ip->i_forkoff > mp->m_sb.sb_inodesize,
mp, XFS_ERRTAG_IFLUSH_6)) {
xfs_alert_tag(mp, XFS_PTAG_IFLUSH,
"%s: bad inode %Lu, forkoff 0x%x, ptr "PTR_FMT,
__func__, ip->i_ino, ip->i_d.di_forkoff, ip);
__func__, ip->i_ino, ip->i_forkoff, ip);
goto flush_out;
}