xfs: update got in xfs_bmap_shift_update_extent

Source kernel commit: 11f75b3bbad57998d1af99391ec3a8e076ab4dd9

This way the caller gets the proper updated extent returned in got.

Signed-off-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 606d6bf4de7280b752027ed4915474e859aeeb43..403858dc595e99ffa905c55d339f9f8c82624cf0 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -5582,35 +5582,33 @@ xfs_bmap_shift_update_extent(
        xfs_fileoff_t           startoff)
 {
        struct xfs_mount        *mp = ip->i_mount;
-       struct xfs_bmbt_irec    new;
+       struct xfs_bmbt_irec    prev = *got;
        int                     error, i;
 
        *logflags |= XFS_ILOG_CORE;
 
-       new = *got;
-       new.br_startoff = startoff;
+       got->br_startoff = startoff;
 
        if (cur) {
-               error = xfs_bmbt_lookup_eq(cur, got, &i);
+               error = xfs_bmbt_lookup_eq(cur, &prev, &i);
                if (error)
                        return error;
                XFS_WANT_CORRUPTED_RETURN(mp, i == 1);
 
-               error = xfs_bmbt_update(cur, &new);
+               error = xfs_bmbt_update(cur, got);
                if (error)
                        return error;
        } else {
                *logflags |= XFS_ILOG_DEXT;
        }
 
-       xfs_iext_update_extent(ip, xfs_bmap_fork_to_state(whichfork), idx,
-                       &new);
+       xfs_iext_update_extent(ip, xfs_bmap_fork_to_state(whichfork), idx, got);
 
        /* update reverse mapping */
-       error = xfs_rmap_unmap_extent(mp, dfops, ip, whichfork, got);
+       error = xfs_rmap_unmap_extent(mp, dfops, ip, whichfork, &prev);
        if (error)
                return error;
-       return xfs_rmap_map_extent(mp, dfops, ip, whichfork, &new);
+       return xfs_rmap_map_extent(mp, dfops, ip, whichfork, got);
 }
 
 int