On Tue, Jul 03, 2018 at 01:23:08PM -0400, Brian Foster wrote:
> Also remove the unnecessary xfs_bmap_split_extent_at() parameter.
>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_bmap.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index c9023c08a78d..43157e5ff46b 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -5880,8 +5880,7 @@ STATIC int
> xfs_bmap_split_extent_at(
> struct xfs_trans *tp,
> struct xfs_inode *ip,
> - xfs_fileoff_t split_fsb,
> - xfs_fsblock_t *firstfsb)
> + xfs_fileoff_t split_fsb)
> {
> int whichfork = XFS_DATA_FORK;
> struct xfs_btree_cur *cur = NULL;
> @@ -5930,7 +5929,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.firstblock = tp->t_firstblock;
> cur->bc_private.b.flags = 0;
> error = xfs_bmbt_lookup_eq(cur, &got, &i);
> if (error)
> @@ -5974,8 +5973,8 @@ 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, &cur, 0,
> - &tmp_logflags, whichfork);
> + error = xfs_bmap_extents_to_btree(tp, ip, &tp->t_firstblock,
> + &cur, 0, &tmp_logflags, whichfork);
> logflags |= tmp_logflags;
> }
>
> @@ -5999,20 +5998,18 @@ xfs_bmap_split_extent(
> struct xfs_mount *mp = ip->i_mount;
> struct xfs_trans *tp;
> struct xfs_defer_ops dfops;
> - xfs_fsblock_t firstfsb;
> int error;
>
> error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write,
> XFS_DIOSTRAT_SPACE_RES(mp, 0), 0, 0, &tp);
> if (error)
> return error;
> - xfs_defer_init(tp, &dfops, &firstfsb);
> + xfs_defer_init(tp, &dfops, &tp->t_firstblock);
>
> xfs_ilock(ip, XFS_ILOCK_EXCL);
> xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
>
> - error = xfs_bmap_split_extent_at(tp, ip, split_fsb,
> - &firstfsb);
> + error = xfs_bmap_split_extent_at(tp, ip, split_fsb);
> if (error)
> goto out;
>
> --
> 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
