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

xfs: move the di_extsize field to struct xfs_inode 



In preparation of removing the historic icinode struct, move the extsize
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 6e73a545

fs/xfs/libxfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -2937,7 +2937,7 @@ xfs_bmap_add_extent_hole_real( 
 */



/*

 * Adjust the size of the new extent based on di_extsize and rt extsize.

 * Adjust the size of the new extent based on i_extsize and rt extsize.

 */

int

xfs_bmap_extsize_align(

fs/xfs/libxfs/xfs_inode_buf.c

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ xfs_inode_from_disk( 


	ip->i_disk_size = be64_to_cpu(from->di_size);

	ip->i_nblocks = be64_to_cpu(from->di_nblocks);

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

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

	to->di_forkoff = from->di_forkoff;

	to->di_flags	= be16_to_cpu(from->di_flags);
@@ -307,7 +307,7 @@ xfs_inode_to_disk( 


	to->di_size = cpu_to_be64(ip->i_disk_size);

	to->di_nblocks = cpu_to_be64(ip->i_nblocks);

	to->di_extsize = cpu_to_be32(from->di_extsize);

	to->di_extsize = cpu_to_be32(ip->i_extsize);

	to->di_nextents = cpu_to_be32(xfs_ifork_nextents(&ip->i_df));

	to->di_anextents = cpu_to_be16(xfs_ifork_nextents(ip->i_afp));

	to->di_forkoff = from->di_forkoff;

fs/xfs/libxfs/xfs_inode_buf.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ struct xfs_dinode; 
 */

struct xfs_icdinode {

	uint16_t	di_flushiter;	/* incremented on flush */

	xfs_extlen_t	di_extsize;	/* basic/minimum extent size for file */

	uint8_t		di_forkoff;	/* attr fork offs, <<3 for 64b align */

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

fs/xfs/xfs_inode.c

+5 −5
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ xfs_get_extsz_hint( 
	 */

	if (xfs_is_always_cow_inode(ip))

		return 0;

	if ((ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE) && ip->i_d.di_extsize)

		return ip->i_d.di_extsize;

	if ((ip->i_d.di_flags & XFS_DIFLAG_EXTSIZE) && ip->i_extsize)

		return ip->i_extsize;

	if (XFS_IS_REALTIME_INODE(ip))

		return ip->i_mount->m_sb.sb_rextsize;

	return 0;
@@ -712,7 +712,7 @@ xfs_inode_inherit_flags( 
			di_flags |= XFS_DIFLAG_RTINHERIT;

		if (pip->i_d.di_flags & XFS_DIFLAG_EXTSZINHERIT) {

			di_flags |= XFS_DIFLAG_EXTSZINHERIT;

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

			ip->i_extsize = pip->i_extsize;

		}

		if (pip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)

			di_flags |= XFS_DIFLAG_PROJINHERIT;
@@ -722,7 +722,7 @@ xfs_inode_inherit_flags( 
			di_flags |= XFS_DIFLAG_REALTIME;

		if (pip->i_d.di_flags & XFS_DIFLAG_EXTSZINHERIT) {

			di_flags |= XFS_DIFLAG_EXTSIZE;

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

			ip->i_extsize = pip->i_extsize;

		}

	}

	if ((pip->i_d.di_flags & XFS_DIFLAG_NOATIME) &&
@@ -839,7 +839,7 @@ xfs_init_new_inode( 
	inode->i_atime = tv;

	inode->i_ctime = tv;



	ip->i_d.di_extsize = 0;

	ip->i_extsize = 0;

	ip->i_d.di_flags = 0;



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

fs/xfs/xfs_inode.h

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ typedef struct xfs_inode { 
	xfs_fsize_t		i_disk_size;	/* number of bytes in file */

	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 */



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