Commit 75329220 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Jialin Zhang
Browse files

xfs: replace XFS_IFORK_Q with a proper predicate function 

mainline inclusion
from mainline-v5.19-rc5
commit 932b42c6
category: bugfix
bugzilla: 187164, https://gitee.com/openeuler/kernel/issues/I4KIAO
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=932b42c66cb5d0ca9800b128415b4ad6b1952b3e



--------------------------------

Replace this shouty macro with a real C function that has a more
descriptive name.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>

conflicts:
	fs/xfs/libxfs/xfs_attr.h
	fs/xfs/libxfs/xfs_inode_fork.c
	fs/xfs/scrub/btree.c
	fs/xfs/xfs_inode.c

Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent e052a18d

fs/xfs/libxfs/xfs_attr.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ int 
xfs_inode_hasattr(

	struct xfs_inode	*ip)

{

	if (!XFS_IFORK_Q(ip))

	if (!xfs_inode_has_attr_fork(ip))

		return 0;

	if (ip->i_af.if_format == XFS_DINODE_FMT_EXTENTS &&

	    ip->i_af.if_nextents == 0)
@@ -428,7 +428,7 @@ xfs_attr_set( 
		 * If the inode doesn't have an attribute fork, add one.

		 * (inode must not be locked when we call this routine)

		 */

		if (XFS_IFORK_Q(dp) == 0) {

		if (xfs_inode_has_attr_fork(dp) == 0) {

			int sf_size = sizeof(struct xfs_attr_sf_hdr) +

				xfs_attr_sf_entsize_byname(args->namelen,

						args->valuelen);

fs/xfs/libxfs/xfs_bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ xfs_bmap_add_attrfork( 
	int			logflags;	/* logging flags */

	int			error;		/* error return value */



	ASSERT(XFS_IFORK_Q(ip) == 0);

	ASSERT(xfs_inode_has_attr_fork(ip) == 0);



	mp = ip->i_mount;

	ASSERT(!XFS_NOT_DQATTACHED(mp, ip));
@@ -1082,7 +1082,7 @@ xfs_bmap_add_attrfork( 
			rsvd, &tp);

	if (error)

		return error;

	if (XFS_IFORK_Q(ip))

	if (xfs_inode_has_attr_fork(ip))

		goto trans_cancel;



	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

fs/xfs/libxfs/xfs_inode_fork.c

+1 −1
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ xfs_ifork_verify_local_attr( 
	struct xfs_ifork	*ifp = &ip->i_af;

	xfs_failaddr_t		fa;



	if (!XFS_IFORK_Q(ip))

	if (!xfs_inode_has_attr_fork(ip))

		fa = __this_address;

	else

		fa = xfs_attr_shortform_verify(ip);

fs/xfs/libxfs/xfs_inode_fork.h

+2 −3
Original line number Diff line number Diff line
@@ -99,13 +99,12 @@ struct xfs_ifork { 
 * Fork handling.

 */



#define XFS_IFORK_Q(ip)			((ip)->i_d.di_forkoff != 0)

#define XFS_IFORK_BOFF(ip)		((int)((ip)->i_d.di_forkoff << 3))



#define XFS_IFORK_DSIZE(ip) \

	(XFS_IFORK_Q(ip) ? XFS_IFORK_BOFF(ip) : XFS_LITINO((ip)->i_mount))

	(xfs_inode_has_attr_fork(ip) ? XFS_IFORK_BOFF(ip) : XFS_LITINO((ip)->i_mount))

#define XFS_IFORK_ASIZE(ip) \

	(XFS_IFORK_Q(ip) ? XFS_LITINO((ip)->i_mount) - XFS_IFORK_BOFF(ip) : 0)

	(xfs_inode_has_attr_fork(ip) ? XFS_LITINO((ip)->i_mount) - XFS_IFORK_BOFF(ip) : 0)

#define XFS_IFORK_SIZE(ip,w) \

	((w) == XFS_DATA_FORK ? \

		XFS_IFORK_DSIZE(ip) : \

fs/xfs/xfs_attr_inactive.c

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ xfs_attr_inactive( 
	ASSERT(! XFS_NOT_DQATTACHED(mp, dp));



	xfs_ilock(dp, lock_mode);

	if (!XFS_IFORK_Q(dp))

	if (!xfs_inode_has_attr_fork(dp))

		goto out_destroy_fork;

	xfs_iunlock(dp, lock_mode);
@@ -349,7 +349,7 @@ xfs_attr_inactive( 
	lock_mode = XFS_ILOCK_EXCL;

	xfs_ilock(dp, lock_mode);



	if (!XFS_IFORK_Q(dp))

	if (!xfs_inode_has_attr_fork(dp))

		goto out_cancel;



	/*