xfs: use ->t_firstblock in xfs_bmapi_remap()

Source kernel commit: 580c4ff9484ac3395ad48b1118b269a6d68c9318

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 2e77d73318f6d5992d897a3aa00a2becb6fff49a..63f22e1de6606b58f5e92130c0f609f4a7442087 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -4492,7 +4492,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);
@@ -4535,7 +4534,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;
        }
 
@@ -4548,7 +4547,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;