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

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

xfs: use ->t_firstblock in xfs_bmapi_remap() 



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 37283797

fs/xfs/libxfs/xfs_bmap.c

+2 −3
Original line number Diff line number Diff line
@@ -4501,7 +4501,6 @@ xfs_bmapi_remap( 
	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_ifork	*ifp;

	struct xfs_btree_cur	*cur = NULL;

	xfs_fsblock_t		firstblock = NULLFSBLOCK;

	struct xfs_bmbt_irec	got;

	struct xfs_iext_cursor	icur;

	int			whichfork = xfs_bmapi_whichfork(flags);
@@ -4544,7 +4543,7 @@ xfs_bmapi_remap( 


	if (ifp->if_flags & XFS_IFBROOT) {

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

		cur->bc_private.b.firstblock = firstblock;

		cur->bc_private.b.firstblock = tp->t_firstblock;

		cur->bc_private.b.flags = 0;

	}
@@ -4557,7 +4556,7 @@ xfs_bmapi_remap( 
		got.br_state = XFS_EXT_NORM;



	error = xfs_bmap_add_extent_hole_real(tp, ip, whichfork, &icur,

			&cur, &got, &firstblock, &logflags, flags);

			&cur, &got, &tp->t_firstblock, &logflags, flags);

	if (error)

		goto error0;