xfs: avoid nested calls to __xfs_trans_commit

commit e96c1e2f262e0993859e266e751977bfad3ca98a upstream

Currently, __xfs_trans_commit calls xfs_defer_finish_noroll, which calls
__xfs_trans_commit again on the same transaction.  In other words,
there's function recursion that has caused minor amounts of confusion in
the past.  There's no reason to keep this around, since there's only one
place where we actually want the xfs_defer_finish_noroll, and that is in
the top level xfs_trans_commit call.

Fixes: 98719051e75ccf ("xfs: refactor internal dfops initialization")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 30e03342287a94643bef731ab0f0e76d0ec11f02..001d9bec4ed57149a17f39ccab114fd4a9ef751e 100644 (file)
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -834,18 +834,6 @@ __xfs_trans_commit(
 
        trace_xfs_trans_commit(tp, _RET_IP_);
 
-       /*
-        * Finish deferred items on final commit. Only permanent transactions
-        * should ever have deferred ops.
-        */
-       WARN_ON_ONCE(!list_empty(&tp->t_dfops) &&
-                    !(tp->t_flags & XFS_TRANS_PERM_LOG_RES));
-       if (!regrant && (tp->t_flags & XFS_TRANS_PERM_LOG_RES)) {
-               error = xfs_defer_finish_noroll(&tp);
-               if (error)
-                       goto out_unreserve;
-       }
-
        error = xfs_trans_run_precommits(tp);
        if (error)
                goto out_unreserve;
@@ -924,6 +912,20 @@ int
 xfs_trans_commit(
        struct xfs_trans        *tp)
 {
+       /*
+        * Finish deferred items on final commit. Only permanent transactions
+        * should ever have deferred ops.
+        */
+       WARN_ON_ONCE(!list_empty(&tp->t_dfops) &&
+                    !(tp->t_flags & XFS_TRANS_PERM_LOG_RES));
+       if (tp->t_flags & XFS_TRANS_PERM_LOG_RES) {
+               int error = xfs_defer_finish_noroll(&tp);
+               if (error) {
+                       xfs_trans_cancel(tp);
+                       return error;
+               }
+       }
+
        return __xfs_trans_commit(tp, false);
 }