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

xfs: use a union for i_cowextsize and i_flushiter 



The i_cowextsize field is only used for v3 inodes, and the i_flushiter
field is only used for v1/v2 inodes.  Use a union to pack the inode a
littler better after adding a few missing guards around their usage.

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 b231b122

fs/xfs/libxfs/xfs_inode_buf.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -193,6 +193,7 @@ xfs_inode_from_disk( 
	 * inode. If the inode is unused, mode is zero and we shouldn't mess

	 * inode. If the inode is unused, mode is zero and we shouldn't mess

	 * with the uninitialized part of it.

	 * with the uninitialized part of it.

	 */

	 */

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

		ip->i_flushiter = be16_to_cpu(from->di_flushiter);

		ip->i_flushiter = be16_to_cpu(from->di_flushiter);

	inode->i_generation = be32_to_cpu(from->di_gen);

	inode->i_generation = be32_to_cpu(from->di_gen);

	inode->i_mode = be16_to_cpu(from->di_mode);

	inode->i_mode = be16_to_cpu(from->di_mode);

fs/xfs/xfs_inode.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -3483,8 +3483,10 @@ xfs_iflush( 
	xfs_inode_to_disk(ip, dip, iip->ili_item.li_lsn);

	xfs_inode_to_disk(ip, dip, iip->ili_item.li_lsn);





	/* Wrap, we never let the log put out DI_MAX_FLUSH */

	/* Wrap, we never let the log put out DI_MAX_FLUSH */

	if (!xfs_sb_version_has_v3inode(&mp->m_sb)) {

		if (ip->i_flushiter == DI_MAX_FLUSH)

		if (ip->i_flushiter == DI_MAX_FLUSH)

			ip->i_flushiter = 0;

			ip->i_flushiter = 0;

	}





	xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK);

	xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK);

	if (XFS_IFORK_Q(ip))

	if (XFS_IFORK_Q(ip))

fs/xfs/xfs_inode.h

+5 −2
Original line number Original line Diff line number Diff line
@@ -58,8 +58,11 @@ typedef struct xfs_inode { 
	xfs_rfsblock_t		i_nblocks;	/* # of direct & btree blocks */

	xfs_rfsblock_t		i_nblocks;	/* # of direct & btree blocks */

	prid_t			i_projid;	/* owner's project id */

	prid_t			i_projid;	/* owner's project id */

	xfs_extlen_t		i_extsize;	/* basic/minimum extent size */

	xfs_extlen_t		i_extsize;	/* basic/minimum extent size */

	/* cowextsize is only used for v3 inodes, flushiter for v1/2 */

	union {

		xfs_extlen_t	i_cowextsize;	/* basic cow extent size */

		xfs_extlen_t	i_cowextsize;	/* basic cow extent size */

		uint16_t	i_flushiter;	/* incremented on flush */

		uint16_t	i_flushiter;	/* incremented on flush */

	};





	struct xfs_icdinode	i_d;		/* most of ondisk inode */

	struct xfs_icdinode	i_d;		/* most of ondisk inode */

fs/xfs/xfs_ioctl.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -1123,6 +1123,7 @@ xfs_fill_fsxattr( 
	simple_fill_fsxattr(fa, xfs_ip2xflags(ip));

	simple_fill_fsxattr(fa, xfs_ip2xflags(ip));





	fa->fsx_extsize = XFS_FSB_TO_B(mp, ip->i_extsize);

	fa->fsx_extsize = XFS_FSB_TO_B(mp, ip->i_extsize);

	if (ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE)

		fa->fsx_cowextsize = XFS_FSB_TO_B(mp, ip->i_cowextsize);

		fa->fsx_cowextsize = XFS_FSB_TO_B(mp, ip->i_cowextsize);

	fa->fsx_projid = ip->i_projid;

	fa->fsx_projid = ip->i_projid;

	if (ifp && (ifp->if_flags & XFS_IFEXTENTS))

	if (ifp && (ifp->if_flags & XFS_IFEXTENTS))
@@ -1523,11 +1524,13 @@ xfs_ioctl_setattr( 
		ip->i_extsize = XFS_B_TO_FSB(mp, fa->fsx_extsize);

		ip->i_extsize = XFS_B_TO_FSB(mp, fa->fsx_extsize);

	else

	else

		ip->i_extsize = 0;

		ip->i_extsize = 0;

	if (xfs_sb_version_has_v3inode(&mp->m_sb) &&



	    (ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE))

	if (xfs_sb_version_has_v3inode(&mp->m_sb)) {

		if (ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE)

			ip->i_cowextsize = XFS_B_TO_FSB(mp, fa->fsx_cowextsize);

			ip->i_cowextsize = XFS_B_TO_FSB(mp, fa->fsx_cowextsize);

		else

		else

			ip->i_cowextsize = 0;

			ip->i_cowextsize = 0;

	}





	error = xfs_trans_commit(tp);

	error = xfs_trans_commit(tp);