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

xfs: move the di_cowextsize field to struct xfs_inode 



In preparation of removing the historic icinode struct, move the
cowextsize field into the containing xfs_inode structure.  Also
switch to use the xfs_extlen_t instead of a uint32_t.

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 031474c2

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( 
					   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);

		to->di_cowextsize = be32_to_cpu(from->di_cowextsize);

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

	}



	error = xfs_iformat_data_fork(ip, from);
@@ -319,7 +319,7 @@ xfs_inode_to_disk( 
		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_cowextsize = cpu_to_be32(from->di_cowextsize);

		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);

		memset(to->di_pad2, 0, sizeof(to->di_pad2));

fs/xfs/libxfs/xfs_inode_buf.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ struct xfs_icdinode { 
	uint16_t	di_flags;	/* random flags, XFS_DIFLAG_... */



	uint64_t	di_flags2;	/* more random flags */

	uint32_t	di_cowextsize;	/* basic cow extent size for file */



	struct timespec64 di_crtime;	/* time created */

};

fs/xfs/xfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ xfs_file_remap_range( 
	    (src->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) &&

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

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

		cowextsize = src->i_d.di_cowextsize;

		cowextsize = src->i_cowextsize;



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

			remap_flags);

fs/xfs/xfs_inode.c

+3 −3
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ xfs_get_cowextsz_hint( 


	a = 0;

	if (ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE)

		a = ip->i_d.di_cowextsize;

		a = ip->i_cowextsize;

	b = xfs_get_extsz_hint(ip);



	a = max(a, b);
@@ -754,7 +754,7 @@ xfs_inode_inherit_flags2( 
{

	if (pip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) {

		ip->i_d.di_flags2 |= XFS_DIFLAG2_COWEXTSIZE;

		ip->i_d.di_cowextsize = pip->i_d.di_cowextsize;

		ip->i_cowextsize = pip->i_cowextsize;

	}

	if (pip->i_d.di_flags2 & XFS_DIFLAG2_DAX)

		ip->i_d.di_flags2 |= XFS_DIFLAG2_DAX;
@@ -844,7 +844,7 @@ xfs_init_new_inode( 


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

		inode_set_iversion(inode, 1);

		ip->i_d.di_cowextsize = 0;

		ip->i_cowextsize = 0;

		ip->i_d.di_crtime = tv;

	}

fs/xfs/xfs_inode.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ typedef struct xfs_inode { 
	xfs_rfsblock_t		i_nblocks;	/* # of direct & btree blocks */

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

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

	xfs_extlen_t		i_cowextsize;	/* basic cow extent size */



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