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

xfs: remove the XFS_DFORK_Q macro 



Just checking di_forkoff directly is a little easier to follow.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChandan Babu R <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 5fd68bdb

fs/xfs/libxfs/xfs_format.h

+2 −3
Original line number Diff line number Diff line
@@ -964,13 +964,12 @@ enum xfs_dinode_fmt { 
/*

 * Inode data & attribute fork sizes, per inode.

 */

#define XFS_DFORK_Q(dip)		((dip)->di_forkoff != 0)

#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_forkoff ? XFS_DFORK_BOFF(dip) : XFS_LITINO(mp))

#define XFS_DFORK_ASIZE(dip,mp) \

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

	((dip)->di_forkoff ? 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_inode_buf.c

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ xfs_inode_from_disk( 
	error = xfs_iformat_data_fork(ip, from);

	if (error)

		return error;

	if (XFS_DFORK_Q(from)) {

	if (from->di_forkoff) {

		error = xfs_iformat_attr_fork(ip, from);

		if (error)

			goto out_destroy_data_fork;
@@ -435,7 +435,7 @@ xfs_dinode_verify_forkoff( 
	struct xfs_dinode	*dip,

	struct xfs_mount	*mp)

{

	if (!XFS_DFORK_Q(dip))

	if (!dip->di_forkoff)

		return NULL;



	switch (dip->di_format)  {
@@ -538,7 +538,7 @@ xfs_dinode_verify( 
		return __this_address;

	}



	if (XFS_DFORK_Q(dip)) {

	if (dip->di_forkoff) {

		fa = xfs_dinode_verify_fork(dip, mp, XFS_ATTR_FORK);

		if (fa)

			return fa;

CRA Git | Maintained and supported by SUSTech CRA and CCSE