xfs: remove xfs_defer_reset

Source kernel commit: b80b29d602a8879829fbf89115e9e6877806a2da

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@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
index 1d1eac62d9cf9eb454de629b2450ff895da02075..4f844b04641bee9f94cf733a8f8e8a8e22c27d0f 100644 (file)
--- a/libxfs/xfs_defer.c
+++ b/libxfs/xfs_defer.c
@@ -310,22 +310,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.
  */
@@ -475,7 +459,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;
 }
 
@@ -549,8 +536,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;
 }
 
 /*