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

xfs: only check the superblock version for dinode size calculation 



The size of the dinode structure is only dependent on the file system
version, so instead of checking the individual inode version just use
the newly added xfs_sb_version_has_large_dinode helper, and simplify
various calling conventions.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent b81b79f4

fs/xfs/libxfs/xfs_attr_leaf.c

+2 −3
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ xfs_attr_shortform_bytesfit( 
	int			offset;



	/* rounded down */

	offset = (XFS_LITINO(mp, dp->i_d.di_version) - bytes) >> 3;

	offset = (XFS_LITINO(mp) - bytes) >> 3;



	if (dp->i_d.di_format == XFS_DINODE_FMT_DEV) {

		minforkoff = roundup(sizeof(xfs_dev_t), 8) >> 3;
@@ -604,8 +604,7 @@ xfs_attr_shortform_bytesfit( 
	minforkoff = roundup(minforkoff, 8) >> 3;



	/* attr fork btree root can have at least this many key/ptr pairs */

	maxforkoff = XFS_LITINO(mp, dp->i_d.di_version) -

			XFS_BMDR_SPACE_CALC(MINABTPTRS);

	maxforkoff = XFS_LITINO(mp) - XFS_BMDR_SPACE_CALC(MINABTPTRS);

	maxforkoff = maxforkoff >> 3;	/* rounded down */



	if (offset >= maxforkoff)

fs/xfs/libxfs/xfs_bmap.c

+4 −6
Original line number Diff line number Diff line
@@ -193,14 +193,12 @@ xfs_default_attroffset( 
	struct xfs_mount	*mp = ip->i_mount;

	uint			offset;



	if (mp->m_sb.sb_inodesize == 256) {

		offset = XFS_LITINO(mp, ip->i_d.di_version) -

				XFS_BMDR_SPACE_CALC(MINABTPTRS);

	} else {

	if (mp->m_sb.sb_inodesize == 256)

		offset = XFS_LITINO(mp) - XFS_BMDR_SPACE_CALC(MINABTPTRS);

	else

		offset = XFS_BMDR_SPACE_CALC(6 * MINABTPTRS);

	}



	ASSERT(offset < XFS_LITINO(mp, ip->i_d.di_version));

	ASSERT(offset < XFS_LITINO(mp));

	return offset;

}

fs/xfs/libxfs/xfs_format.h

+8 −8
Original line number Diff line number Diff line
@@ -954,8 +954,12 @@ enum xfs_dinode_fmt { 
/*

 * Inode size for given fs.

 */

#define XFS_LITINO(mp, version) \

	((int)(((mp)->m_sb.sb_inodesize) - xfs_dinode_size(version)))

#define XFS_DINODE_SIZE(sbp) \

	(xfs_sb_version_has_v3inode(sbp) ? \

		sizeof(struct xfs_dinode) : \

		offsetof(struct xfs_dinode, di_crc))

#define XFS_LITINO(mp) \

	((mp)->m_sb.sb_inodesize - XFS_DINODE_SIZE(&(mp)->m_sb))



/*

 * Inode data & attribute fork sizes, per inode.
@@ -964,13 +968,9 @@ enum xfs_dinode_fmt { 
#define XFS_DFORK_BOFF(dip)		((int)((dip)->di_forkoff << 3))



#define XFS_DFORK_DSIZE(dip,mp) \

	(XFS_DFORK_Q(dip) ? \

		XFS_DFORK_BOFF(dip) : \

		XFS_LITINO(mp, (dip)->di_version))

	(XFS_DFORK_Q(dip) ? XFS_DFORK_BOFF(dip) : XFS_LITINO(mp))

#define XFS_DFORK_ASIZE(dip,mp) \

	(XFS_DFORK_Q(dip) ? \

		XFS_LITINO(mp, (dip)->di_version) - XFS_DFORK_BOFF(dip) : \

		0)

	(XFS_DFORK_Q(dip) ? XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : 0)

#define XFS_DFORK_SIZE(dip,mp,w) \

	((w) == XFS_DATA_FORK ? \

		XFS_DFORK_DSIZE(dip, mp) : \

fs/xfs/libxfs/xfs_ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ xfs_ialloc_inode_init( 
		xfs_buf_zero(fbuf, 0, BBTOB(fbuf->b_length));

		for (i = 0; i < M_IGEO(mp)->inodes_per_cluster; i++) {

			int	ioffset = i << mp->m_sb.sb_inodelog;

			uint	isize = xfs_dinode_size(version);

			uint	isize = XFS_DINODE_SIZE(&mp->m_sb);



			free = xfs_make_iptr(mp, fbuf, i);

			free->di_magic = cpu_to_be16(XFS_DINODE_MAGIC);

fs/xfs/libxfs/xfs_inode_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ xfs_dinode_verify_forkoff( 
	case XFS_DINODE_FMT_LOCAL:	/* fall through ... */

	case XFS_DINODE_FMT_EXTENTS:    /* fall through ... */

	case XFS_DINODE_FMT_BTREE:

		if (dip->di_forkoff >= (XFS_LITINO(mp, dip->di_version) >> 3))

		if (dip->di_forkoff >= (XFS_LITINO(mp) >> 3))

			return __this_address;

		break;

	default: