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

xfs: move the di_flags2 field to struct xfs_inode 



In preparation of removing the historic icinode struct, move the flags2
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 db07349d

fs/xfs/libxfs/xfs_inode_buf.c

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ xfs_inode_from_disk( 
		inode_set_iversion_queried(inode,

					   be64_to_cpu(from->di_changecount));

		to->di_crtime = xfs_inode_from_disk_ts(from, from->di_crtime);

		to->di_flags2 = be64_to_cpu(from->di_flags2);

		ip->i_diflags2 = be64_to_cpu(from->di_flags2);

		ip->i_cowextsize = be32_to_cpu(from->di_cowextsize);

	}
@@ -319,7 +319,7 @@ xfs_inode_to_disk( 
		to->di_version = 3;

		to->di_changecount = cpu_to_be64(inode_peek_iversion(inode));

		to->di_crtime = xfs_inode_to_disk_ts(ip, from->di_crtime);

		to->di_flags2 = cpu_to_be64(from->di_flags2);

		to->di_flags2 = cpu_to_be64(ip->i_diflags2);

		to->di_cowextsize = cpu_to_be32(ip->i_cowextsize);

		to->di_ino = cpu_to_be64(ip->i_ino);

		to->di_lsn = cpu_to_be64(lsn);

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 {

	uint64_t	di_flags2;	/* more random flags */



	struct timespec64 di_crtime;	/* time created */

};

fs/xfs/libxfs/xfs_trans_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ xfs_trans_log_inode( 
	if ((flags & (XFS_ILOG_CORE | XFS_ILOG_TIMESTAMP)) &&

	    xfs_sb_version_hasbigtime(&ip->i_mount->m_sb) &&

	    !xfs_inode_has_bigtime(ip)) {

		ip->i_d.di_flags2 |= XFS_DIFLAG2_BIGTIME;

		ip->i_diflags2 |= XFS_DIFLAG2_BIGTIME;

		flags |= XFS_ILOG_CORE;

	}

fs/xfs/xfs_bmap_util.c

+12 −12
Original line number Diff line number Diff line
@@ -1323,9 +1323,9 @@ xfs_swap_extent_rmap( 
	 * rmap functions when we go to fix up the rmaps.  The flags

	 * will be switch for reals later.

	 */

	tip_flags2 = tip->i_d.di_flags2;

	if (ip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK)

		tip->i_d.di_flags2 |= XFS_DIFLAG2_REFLINK;

	tip_flags2 = tip->i_diflags2;

	if (ip->i_diflags2 & XFS_DIFLAG2_REFLINK)

		tip->i_diflags2 |= XFS_DIFLAG2_REFLINK;



	offset_fsb = 0;

	end_fsb = XFS_B_TO_FSB(ip->i_mount, i_size_read(VFS_I(ip)));
@@ -1412,12 +1412,12 @@ xfs_swap_extent_rmap( 
		offset_fsb += ilen;

	}



	tip->i_d.di_flags2 = tip_flags2;

	tip->i_diflags2 = tip_flags2;

	return 0;



out:

	trace_xfs_swap_extent_rmap_error(ip, error, _RET_IP_);

	tip->i_d.di_flags2 = tip_flags2;

	tip->i_diflags2 = tip_flags2;

	return error;

}
@@ -1715,13 +1715,13 @@ xfs_swap_extents( 
		goto out_trans_cancel;



	/* Do we have to swap reflink flags? */

	if ((ip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK) ^

	    (tip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK)) {

		f = ip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK;

		ip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK;

		ip->i_d.di_flags2 |= tip->i_d.di_flags2 & XFS_DIFLAG2_REFLINK;

		tip->i_d.di_flags2 &= ~XFS_DIFLAG2_REFLINK;

		tip->i_d.di_flags2 |= f & XFS_DIFLAG2_REFLINK;

	if ((ip->i_diflags2 & XFS_DIFLAG2_REFLINK) ^

	    (tip->i_diflags2 & XFS_DIFLAG2_REFLINK)) {

		f = ip->i_diflags2 & XFS_DIFLAG2_REFLINK;

		ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK;

		ip->i_diflags2 |= tip->i_diflags2 & XFS_DIFLAG2_REFLINK;

		tip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK;

		tip->i_diflags2 |= f & XFS_DIFLAG2_REFLINK;

	}



	/* Swap the cow forks. */

fs/xfs/xfs_file.c

+2 −2
Original line number Diff line number Diff line
@@ -1159,9 +1159,9 @@ xfs_file_remap_range( 
	 */

	cowextsize = 0;

	if (pos_in == 0 && len == i_size_read(inode_in) &&

	    (src->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) &&

	    (src->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE) &&

	    pos_out == 0 && len >= i_size_read(inode_out) &&

	    !(dest->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE))

	    !(dest->i_diflags2 & XFS_DIFLAG2_COWEXTSIZE))

		cowextsize = src->i_cowextsize;



	ret = xfs_reflink_update_dest(dest, pos_out + len, cowextsize,