Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d76e6ce8 authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong
Browse files

xfs: use ->t_dfops in extent split tx and remove param 



Attach the local dfops to ->t_dfops of the extent split transaction.
Since this is the only caller of xfs_bmap_split_extent_at(), remove
the dfops parameter as well.

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

fs/xfs/libxfs/xfs_bmap.c

+6 −7
Original line number Diff line number Diff line
@@ -5919,8 +5919,7 @@ xfs_bmap_split_extent_at( 
	struct xfs_trans	*tp,

	struct xfs_inode	*ip,

	xfs_fileoff_t		split_fsb,

	xfs_fsblock_t		*firstfsb,

	struct xfs_defer_ops	*dfops)

	xfs_fsblock_t		*firstfsb)

{

	int				whichfork = XFS_DATA_FORK;

	struct xfs_btree_cur		*cur = NULL;
@@ -5970,7 +5969,7 @@ xfs_bmap_split_extent_at( 
	if (ifp->if_flags & XFS_IFBROOT) {

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_private.b.firstblock = *firstfsb;

		cur->bc_private.b.dfops = dfops;

		cur->bc_private.b.dfops = tp->t_dfops;

		cur->bc_private.b.flags = 0;

		error = xfs_bmbt_lookup_eq(cur, &got, &i);

		if (error)
@@ -6014,7 +6013,7 @@ xfs_bmap_split_extent_at( 
		int tmp_logflags; /* partial log flag return val */



		ASSERT(cur == NULL);

		error = xfs_bmap_extents_to_btree(tp, ip, firstfsb, dfops,

		error = xfs_bmap_extents_to_btree(tp, ip, firstfsb, tp->t_dfops,

				&cur, 0, &tmp_logflags, whichfork);

		logflags |= tmp_logflags;

	}
@@ -6046,14 +6045,14 @@ xfs_bmap_split_extent( 
			XFS_DIOSTRAT_SPACE_RES(mp, 0), 0, 0, &tp);

	if (error)

		return error;

	xfs_defer_init(&dfops, &firstfsb);

	tp->t_dfops = &dfops;



	xfs_ilock(ip, XFS_ILOCK_EXCL);

	xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);



	xfs_defer_init(&dfops, &firstfsb);



	error = xfs_bmap_split_extent_at(tp, ip, split_fsb,

			&firstfsb, &dfops);

					 &firstfsb);

	if (error)

		goto out;