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

xfs: convert XFS_IFORK_PTR to a static inline helper 

mainline inclusion
from mainline-v5.19-rc5
commit 732436ef
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=732436ef916b4f338d672ea56accfdb11e8d0732



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

We're about to make this logic do a bit more, so convert the macro to a
static inline function for better typechecking and fewer shouty macros.
No functional changes here.

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

conflicts:
	fs/xfs/libxfs/xfs_bmap.c
	fs/xfs/libxfs/xfs_bmap_btree.c
	fs/xfs/libxfs/xfs_inode_fork.c
	fs/xfs/libxfs/xfs_inode_fork.h
	fs/xfs/scrub/bmap.c
	fs/xfs/scrub/symlink.c
	fs/xfs/xfs_inode.c
	fs/xfs/xfs_ioctl.c
	fs/xfs/xfs_qm.c
	fs/xfs/xfs_reflink.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 eded30e6

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -1022,7 +1022,7 @@ xfs_attr_shortform_verify( 
	int64_t				size;



	ASSERT(ip->i_afp->if_format == XFS_DINODE_FMT_LOCAL);

	ifp = XFS_IFORK_PTR(ip, XFS_ATTR_FORK);

	ifp = xfs_ifork_ptr(ip, XFS_ATTR_FORK);

	sfp = (struct xfs_attr_shortform *)ifp->if_u1.if_data;

	size = ifp->if_bytes;

fs/xfs/libxfs/xfs_bmap.c

+35 −35
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ xfs_bmbt_lookup_first( 
 */

static inline bool xfs_bmap_needs_btree(struct xfs_inode *ip, int whichfork)

{

	struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork *ifp = xfs_ifork_ptr(ip, whichfork);



	return whichfork != XFS_COW_FORK &&

		ifp->if_format == XFS_DINODE_FMT_EXTENTS &&
@@ -132,7 +132,7 @@ static inline bool xfs_bmap_needs_btree(struct xfs_inode *ip, int whichfork) 
 */

static inline bool xfs_bmap_wants_extents(struct xfs_inode *ip, int whichfork)

{

	struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork *ifp = xfs_ifork_ptr(ip, whichfork);



	return whichfork != XFS_COW_FORK &&

		ifp->if_format == XFS_DINODE_FMT_BTREE &&
@@ -318,7 +318,7 @@ xfs_bmap_check_leaf_extents( 
	int			whichfork)	/* data or attr fork */

{

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork        *ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_btree_block	*block;	/* current btree block */

	xfs_fsblock_t		bno;	/* block # of "block" */

	xfs_buf_t		*bp;	/* buffer for "block" */
@@ -587,7 +587,7 @@ xfs_bmap_btree_to_extents( 
	int			*logflagsp, /* inode logging flags */

	int			whichfork)  /* data or attr fork */

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_btree_block	*rblock = ifp->if_broot;

	struct xfs_btree_block	*cblock;/* child btree block */
@@ -666,7 +666,7 @@ xfs_bmap_extents_to_btree( 


	mp = ip->i_mount;

	ASSERT(whichfork != XFS_COW_FORK);

	ifp = XFS_IFORK_PTR(ip, whichfork);

	ifp = xfs_ifork_ptr(ip, whichfork);

	ASSERT(ifp->if_format == XFS_DINODE_FMT_EXTENTS);



	/*
@@ -796,7 +796,7 @@ xfs_bmap_local_to_extents_empty( 
	struct xfs_inode	*ip,

	int			whichfork)

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);



	ASSERT(whichfork != XFS_COW_FORK);

	ASSERT(ifp->if_format == XFS_DINODE_FMT_LOCAL);
@@ -838,7 +838,7 @@ xfs_bmap_local_to_extents( 
	 * So sending the data fork of a regular inode is invalid.

	 */

	ASSERT(!(S_ISREG(VFS_I(ip)->i_mode) && whichfork == XFS_DATA_FORK));

	ifp = XFS_IFORK_PTR(ip, whichfork);

	ifp = xfs_ifork_ptr(ip, whichfork);

	ASSERT(ifp->if_format == XFS_DINODE_FMT_LOCAL);



	if (!ifp->if_bytes) {
@@ -1168,7 +1168,7 @@ xfs_iread_bmbt_block( 
	xfs_extnum_t		num_recs;

	xfs_extnum_t		j;

	int			whichfork = cur->bc_ino.whichfork;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);



	block = xfs_btree_get_block(cur, level, &bp);
@@ -1216,7 +1216,7 @@ xfs_iread_extents( 
	int			whichfork)

{

	struct xfs_iread_state	ir;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_btree_cur	*cur;

	int			error;
@@ -1264,7 +1264,7 @@ xfs_bmap_first_unused( 
	xfs_fileoff_t		*first_unused,	/* unused block */

	int			whichfork)	/* data or attr fork */

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_bmbt_irec	got;

	struct xfs_iext_cursor	icur;

	xfs_fileoff_t		lastaddr = 0;
@@ -1313,7 +1313,7 @@ xfs_bmap_last_before( 
	xfs_fileoff_t		*last_block,	/* last block */

	int			whichfork)	/* data or attr fork */

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_bmbt_irec	got;

	struct xfs_iext_cursor	icur;

	int			error;
@@ -1349,7 +1349,7 @@ xfs_bmap_last_extent( 
	struct xfs_bmbt_irec	*rec,

	int			*is_empty)

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_iext_cursor	icur;

	int			error;
@@ -1417,7 +1417,7 @@ xfs_bmap_last_offset( 
	xfs_fileoff_t		*last_block,

	int			whichfork)

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_bmbt_irec	rec;

	int			is_empty;

	int			error;
@@ -1448,7 +1448,7 @@ xfs_bmap_one_block( 
	struct xfs_inode	*ip,		/* incore inode */

	int			whichfork)	/* data or attr fork */

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	int			rval;		/* return value */

	struct xfs_bmbt_irec	s;		/* internal version of extent */

	struct xfs_iext_cursor icur;
@@ -1483,7 +1483,7 @@ xfs_bmap_add_extent_delay_real( 
	int			whichfork)

{

	struct xfs_mount	*mp = bma->ip->i_mount;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(bma->ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(bma->ip, whichfork);

	struct xfs_bmbt_irec	*new = &bma->got;

	int			error;	/* error return value */

	int			i;	/* temp state */
@@ -2049,7 +2049,7 @@ xfs_bmap_add_extent_unwritten_real( 
	*logflagsp = 0;



	cur = *curp;

	ifp = XFS_IFORK_PTR(ip, whichfork);

	ifp = xfs_ifork_ptr(ip, whichfork);



	ASSERT(!isnullstartblock(new->br_startblock));
@@ -2574,7 +2574,7 @@ xfs_bmap_add_extent_hole_delay( 
	int			state = xfs_bmap_fork_to_state(whichfork);

	xfs_filblks_t		temp;	 /* temp for indirect calculations */



	ifp = XFS_IFORK_PTR(ip, whichfork);

	ifp = xfs_ifork_ptr(ip, whichfork);

	ASSERT(isnullstartblock(new->br_startblock));



	/*
@@ -2710,7 +2710,7 @@ xfs_bmap_add_extent_hole_real( 
	int			*logflagsp,

	int			flags)

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_btree_cur	*cur = *curp;

	int			error;	/* error return value */
@@ -3863,7 +3863,7 @@ xfs_bmapi_read( 
{

	struct xfs_mount	*mp = ip->i_mount;

	int			whichfork = xfs_bmapi_whichfork(flags);

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_bmbt_irec	got;

	xfs_fileoff_t		obno;

	xfs_fileoff_t		end;
@@ -3958,7 +3958,7 @@ xfs_bmapi_reserve_delalloc( 
	int			eof)

{

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	xfs_extlen_t		alen;

	xfs_extlen_t		indlen;

	int			error;
@@ -4081,7 +4081,7 @@ xfs_bmapi_allocate( 
{

	struct xfs_mount	*mp = bma->ip->i_mount;

	int			whichfork = xfs_bmapi_whichfork(bma->flags);

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(bma->ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(bma->ip, whichfork);

	int			tmp_logflags = 0;

	int			error;
@@ -4175,7 +4175,7 @@ xfs_bmapi_convert_unwritten( 
	int			flags)

{

	int			whichfork = xfs_bmapi_whichfork(flags);

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(bma->ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(bma->ip, whichfork);

	int			tmp_logflags = 0;

	int			error;
@@ -4252,7 +4252,7 @@ xfs_bmapi_minleft( 
	struct xfs_inode	*ip,

	int			fork)

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, fork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, fork);



	if (tp && tp->t_firstblock != NULLFSBLOCK)

		return 0;
@@ -4273,7 +4273,7 @@ xfs_bmapi_finish( 
	int			whichfork,

	int			error)

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(bma->ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(bma->ip, whichfork);



	if ((bma->logflags & xfs_ilog_fext(whichfork)) &&

	    ifp->if_format != XFS_DINODE_FMT_EXTENTS)
@@ -4312,7 +4312,7 @@ xfs_bmapi_write( 
	};

	struct xfs_mount	*mp = ip->i_mount;

	int			whichfork = xfs_bmapi_whichfork(flags);

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	xfs_fileoff_t		end;		/* end of mapped file region */

	bool			eof = false;	/* after the end of extents */

	int			error;		/* error return */
@@ -4495,7 +4495,7 @@ xfs_bmapi_convert_delalloc( 
	struct iomap		*iomap,

	unsigned int		*seq)

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_mount	*mp = ip->i_mount;

	xfs_fileoff_t		offset_fsb = XFS_B_TO_FSBT(mp, offset);

	struct xfs_bmalloca	bma = { NULL };
@@ -4629,7 +4629,7 @@ xfs_bmapi_remap( 
	int			whichfork = xfs_bmapi_whichfork(flags);

	int			logflags = 0, error;



	ifp = XFS_IFORK_PTR(ip, whichfork);

	ifp = xfs_ifork_ptr(ip, whichfork);

	ASSERT(len > 0);

	ASSERT(len <= (xfs_filblks_t)MAXEXTLEN);

	ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
@@ -4788,7 +4788,7 @@ xfs_bmap_del_extent_delay( 
	struct xfs_bmbt_irec	*del)

{

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_bmbt_irec	new;

	int64_t			da_old, da_new, da_diff = 0;

	xfs_fileoff_t		del_endoff, got_endoff;
@@ -4915,7 +4915,7 @@ xfs_bmap_del_extent_cow( 
	struct xfs_bmbt_irec	*del)

{

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, XFS_COW_FORK);

	struct xfs_bmbt_irec	new;

	xfs_fileoff_t		del_endoff, got_endoff;

	int			state = BMAP_COWFORK;
@@ -5013,7 +5013,7 @@ xfs_bmap_del_extent_real( 
	mp = ip->i_mount;

	XFS_STATS_INC(mp, xs_del_exlist);



	ifp = XFS_IFORK_PTR(ip, whichfork);

	ifp = xfs_ifork_ptr(ip, whichfork);

	ASSERT(del->br_blockcount > 0);

	xfs_iext_get_extent(ifp, icur, &got);

	ASSERT(got.br_startoff <= del->br_startoff);
@@ -5300,7 +5300,7 @@ __xfs_bunmapi( 


	whichfork = xfs_bmapi_whichfork(flags);

	ASSERT(whichfork != XFS_COW_FORK);

	ifp = XFS_IFORK_PTR(ip, whichfork);

	ifp = xfs_ifork_ptr(ip, whichfork);

	if (XFS_IS_CORRUPT(mp, !xfs_ifork_has_extents(ifp)))

		return -EFSCORRUPTED;

	if (XFS_FORCED_SHUTDOWN(mp))
@@ -5659,7 +5659,7 @@ xfs_bmse_merge( 
	struct xfs_btree_cur		*cur,

	int				*logflags)	/* output */

{

	struct xfs_ifork		*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork		*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_bmbt_irec		new;

	xfs_filblks_t			blockcount;

	int				error, i;
@@ -5780,7 +5780,7 @@ xfs_bmap_collapse_extents( 
{

	int			whichfork = XFS_DATA_FORK;

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_btree_cur	*cur = NULL;

	struct xfs_bmbt_irec	got, prev;

	struct xfs_iext_cursor	icur;
@@ -5897,7 +5897,7 @@ xfs_bmap_insert_extents( 
{

	int			whichfork = XFS_DATA_FORK;

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_btree_cur	*cur = NULL;

	struct xfs_bmbt_irec	got, next;

	struct xfs_iext_cursor	icur;
@@ -5999,7 +5999,7 @@ xfs_bmap_split_extent( 
	xfs_fileoff_t		split_fsb)

{

	int				whichfork = XFS_DATA_FORK;

	struct xfs_ifork		*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork		*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_btree_cur		*cur = NULL;

	struct xfs_bmbt_irec		got;

	struct xfs_bmbt_irec		new; /* split extent */

fs/xfs/libxfs/xfs_bmap_btree.c

+4 −4
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ xfs_bmbt_get_minrecs( 
	if (level == cur->bc_nlevels - 1) {

		struct xfs_ifork	*ifp;



		ifp = XFS_IFORK_PTR(cur->bc_ino.ip,

		ifp = xfs_ifork_ptr(cur->bc_ino.ip,

				    cur->bc_ino.whichfork);



		return xfs_bmbt_maxrecs(cur->bc_mp,
@@ -320,7 +320,7 @@ xfs_bmbt_get_maxrecs( 
	if (level == cur->bc_nlevels - 1) {

		struct xfs_ifork	*ifp;



		ifp = XFS_IFORK_PTR(cur->bc_ino.ip,

		ifp = xfs_ifork_ptr(cur->bc_ino.ip,

				    cur->bc_ino.whichfork);



		return xfs_bmbt_maxrecs(cur->bc_mp,
@@ -548,7 +548,7 @@ xfs_bmbt_init_cursor( 
	struct xfs_inode	*ip,		/* inode owning the btree */

	int			whichfork)	/* data or attr fork */

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_btree_cur	*cur;

	ASSERT(whichfork != XFS_COW_FORK);
@@ -636,7 +636,7 @@ xfs_bmbt_change_owner( 


	ASSERT(tp || buffer_list);

	ASSERT(!(tp && buffer_list));

	ASSERT(XFS_IFORK_PTR(ip, whichfork)->if_format == XFS_DINODE_FMT_BTREE);

	ASSERT(xfs_ifork_ptr(ip, whichfork)->if_format == XFS_DINODE_FMT_BTREE);



	cur = xfs_bmbt_init_cursor(ip->i_mount, tp, ip, whichfork);

	if (!cur)

fs/xfs/libxfs/xfs_btree.c

+2 −2
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ xfs_btree_ifork_ptr( 


	if (cur->bc_flags & XFS_BTREE_STAGING)

		return cur->bc_ino.ifake->if_fork;

	return XFS_IFORK_PTR(cur->bc_ino.ip, cur->bc_ino.whichfork);

	return xfs_ifork_ptr(cur->bc_ino.ip, cur->bc_ino.whichfork);

}



/*
@@ -3475,7 +3475,7 @@ xfs_btree_kill_iroot( 
{

	int			whichfork = cur->bc_ino.whichfork;

	struct xfs_inode	*ip = cur->bc_ino.ip;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(ip, whichfork);

	struct xfs_btree_block	*block;

	struct xfs_btree_block	*cblock;

	union xfs_btree_key	*kp;

fs/xfs/libxfs/xfs_dir2_block.c

+1 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ xfs_dir2_sf_to_block( 
	struct xfs_trans	*tp = args->trans;

	struct xfs_inode	*dp = args->dp;

	struct xfs_mount	*mp = dp->i_mount;

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(dp, XFS_DATA_FORK);

	struct xfs_ifork	*ifp = xfs_ifork_ptr(dp, XFS_DATA_FORK);

	struct xfs_da_geometry	*geo = args->geo;

	xfs_dir2_db_t		blkno;		/* dir-relative block # (0) */

	xfs_dir2_data_hdr_t	*hdr;		/* block header */