On Tue, Sep 29, 2020 at 10:43:18AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
> Remove this one-line helper since the assert is trivially true in one
> call site and the rest obscures a bitmask operation.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/libxfs/xfs_defer.c | 24 +++++-------------------
> 1 file changed, 5 insertions(+), 19 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
> index 29e9762f3b77..36c103c14bc9 100644
> --- a/fs/xfs/libxfs/xfs_defer.c
> +++ b/fs/xfs/libxfs/xfs_defer.c
> @@ -312,22 +312,6 @@ xfs_defer_trans_roll(
> return error;
> }
>
> -/*
> - * Reset an already used dfops after finish.
> - */
> -static void
> -xfs_defer_reset(
> - struct xfs_trans *tp)
> -{
> - ASSERT(list_empty(&tp->t_dfops));
> -
> - /*
> - * Low mode state transfers across transaction rolls to mirror dfops
> - * lifetime. Clear it now that dfops is reset.
> - */
> - tp->t_flags &= ~XFS_TRANS_LOWMODE;
> -}
> -
> /*
> * Free up any items left in the list.
> */
> @@ -477,7 +461,10 @@ xfs_defer_finish(
> return error;
> }
> }
> - xfs_defer_reset(*tp);
> +
> + /* Reset LOWMODE now that we've finished all the dfops. */
> + ASSERT(list_empty(&(*tp)->t_dfops));
> + (*tp)->t_flags &= ~XFS_TRANS_LOWMODE;
> return 0;
> }
>
> @@ -551,8 +538,7 @@ xfs_defer_move(
> * that behavior.
> */
> dtp->t_flags |= (stp->t_flags & XFS_TRANS_LOWMODE);
> -
> - xfs_defer_reset(stp);
> + stp->t_flags &= ~XFS_TRANS_LOWMODE;
> }
>
> /*
>
