On Tue, Jul 03, 2018 at 01:23:17PM -0400, Brian Foster wrote:
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_bmap_util.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index 6d2baf51fec9..96810bea07fd 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -1569,7 +1569,6 @@ xfs_swap_extent_rmap(
> xfs_fileoff_t offset_fsb;
> xfs_fileoff_t end_fsb;
> xfs_filblks_t count_fsb;
> - xfs_fsblock_t firstfsb;
> int error;
> xfs_filblks_t ilen;
> xfs_filblks_t rlen;
> @@ -1605,7 +1604,7 @@ xfs_swap_extent_rmap(
>
> /* Unmap the old blocks in the source file. */
> while (tirec.br_blockcount) {
> - xfs_defer_init(tp, tp->t_dfops, &firstfsb);
> + xfs_defer_init(tp, tp->t_dfops, &tp->t_firstblock);
> trace_xfs_swap_extent_rmap_remap_piece(tip, &tirec);
>
> /* Read extent from the source file */
> @@ -1847,7 +1846,6 @@ xfs_swap_extents(
> struct xfs_ifork *cowfp;
> uint64_t f;
> int resblks = 0;
> - xfs_fsblock_t firstfsb;
>
> /*
> * Lock the inodes against other IO, page faults and truncate to
> @@ -1910,7 +1908,7 @@ xfs_swap_extents(
> error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0, 0, &tp);
> if (error)
> goto out_unlock;
> - xfs_defer_init(tp, &dfops, &firstfsb);
> + xfs_defer_init(tp, &dfops, &tp->t_firstblock);
>
> /*
> * Lock and join the inodes to the tansaction so that transaction commit
> --
> 2.17.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
