Commit db07349d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: move the di_flags field to struct xfs_inode 



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

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 7821ea30

fs/xfs/libxfs/xfs_bmap_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ xfs_bmbt_update_cursor( 
	struct xfs_btree_cur	*dst)

{

	ASSERT((dst->bc_tp->t_firstblock != NULLFSBLOCK) ||

	       (dst->bc_ino.ip->i_d.di_flags & XFS_DIFLAG_REALTIME));

	       (dst->bc_ino.ip->i_diflags & XFS_DIFLAG_REALTIME));



	dst->bc_ino.allocated += src->bc_ino.allocated;

	dst->bc_tp->t_firstblock = src->bc_tp->t_firstblock;

fs/xfs/libxfs/xfs_inode_buf.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ xfs_inode_from_disk( 
	ip->i_nblocks = be64_to_cpu(from->di_nblocks);

	ip->i_extsize = be32_to_cpu(from->di_extsize);

	ip->i_forkoff = from->di_forkoff;

	to->di_flags	= be16_to_cpu(from->di_flags);

	ip->i_diflags	= be16_to_cpu(from->di_flags);



	if (from->di_dmevmask || from->di_dmstate)

		xfs_iflags_set(ip, XFS_IPRESERVE_DM_FIELDS);
@@ -313,7 +313,7 @@ xfs_inode_to_disk( 
	to->di_anextents = cpu_to_be16(xfs_ifork_nextents(ip->i_afp));

	to->di_forkoff = ip->i_forkoff;

	to->di_aformat = xfs_ifork_format(ip->i_afp);

	to->di_flags = cpu_to_be16(from->di_flags);

	to->di_flags = cpu_to_be16(ip->i_diflags);



	if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) {

		to->di_version = 3;

fs/xfs/libxfs/xfs_inode_buf.h

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ struct xfs_dinode; 
 * format specific structures at the appropriate time.

 */

struct xfs_icdinode {

	uint16_t	di_flags;	/* random flags, XFS_DIFLAG_... */



	uint64_t	di_flags2;	/* more random flags */



	struct timespec64 di_crtime;	/* time created */

fs/xfs/libxfs/xfs_rtbitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -997,8 +997,8 @@ xfs_rtfree_extent( 
	 */

	if (tp->t_frextents_delta + mp->m_sb.sb_frextents ==

	    mp->m_sb.sb_rextents) {

		if (!(mp->m_rbmip->i_d.di_flags & XFS_DIFLAG_NEWRTBM))

			mp->m_rbmip->i_d.di_flags |= XFS_DIFLAG_NEWRTBM;

		if (!(mp->m_rbmip->i_diflags & XFS_DIFLAG_NEWRTBM))

			mp->m_rbmip->i_diflags |= XFS_DIFLAG_NEWRTBM;

		*(uint64_t *)&VFS_I(mp->m_rbmip)->i_atime = 0;

		xfs_trans_log_inode(tp, mp->m_rbmip, XFS_ILOG_CORE);

	}

fs/xfs/scrub/common.c

+1 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ xchk_metadata_inode_forks( 
		return 0;



	/* Metadata inodes don't live on the rt device. */

	if (sc->ip->i_d.di_flags & XFS_DIFLAG_REALTIME) {

	if (sc->ip->i_diflags & XFS_DIFLAG_REALTIME) {

		xchk_ino_set_corrupt(sc, sc->ip->i_ino);

		return 0;

	}