1 files changed, 25 insertions, 18 deletions

diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 912b42f5fe4a..d42a68d8313b 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -11,7 +11,6 @@
 #include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
 #include "xfs_mount.h"
-#include "xfs_inode.h"
 #include "xfs_extent_busy.h"
 #include "xfs_quota.h"
 #include "xfs_trans.h"
@@ -264,9 +263,7 @@ xfs_trans_alloc(
          * GFP_NOFS allocation context so that we avoid lockdep false positives
          * by doing GFP_KERNEL allocations inside sb_start_intwrite().
          */
-        tp = kmem_zone_zalloc(xfs_trans_zone,
-                (flags & XFS_TRANS_NOFS) ? KM_NOFS : KM_SLEEP);
-
+        tp = kmem_zone_zalloc(xfs_trans_zone, KM_SLEEP);
         if (!(flags & XFS_TRANS_NO_WRITECOUNT))
                 sb_start_intwrite(mp->m_super);
 
@@ -452,7 +449,7 @@ xfs_trans_apply_sb_deltas(
         xfs_buf_t       *bp;
         int             whole = 0;
 
-        bp = xfs_trans_getsb(tp, tp->t_mountp, 0);
+        bp = xfs_trans_getsb(tp, tp->t_mountp);
         sbp = XFS_BUF_TO_SBP(bp);
 
         /*
@@ -767,10 +764,9 @@ xfs_trans_del_item(
 }
 
 /* Detach and unlock all of the items in a transaction */
-void
+static void
 xfs_trans_free_items(
         struct xfs_trans        *tp,
-        xfs_lsn_t               commit_lsn,
         bool                    abort)
 {
         struct xfs_log_item     *lip, *next;
@@ -779,11 +775,10 @@ xfs_trans_free_items(
 
         list_for_each_entry_safe(lip, next, &tp->t_items, li_trans) {
                 xfs_trans_del_item(lip);
-                if (commit_lsn != NULLCOMMITLSN)
-                        lip->li_ops->iop_committing(lip, commit_lsn);
                 if (abort)
                         set_bit(XFS_LI_ABORTED, &lip->li_flags);
-                lip->li_ops->iop_unlock(lip);
+                if (lip->li_ops->iop_release)
+                        lip->li_ops->iop_release(lip);
         }
 }
 
@@ -804,7 +799,8 @@ xfs_log_item_batch_insert(
         for (i = 0; i < nr_items; i++) {
                 struct xfs_log_item *lip = log_items[i];
 
-                lip->li_ops->iop_unpin(lip, 0);
+                if (lip->li_ops->iop_unpin)
+                        lip->li_ops->iop_unpin(lip, 0);
         }
 }
 
@@ -815,7 +811,7 @@ xfs_log_item_batch_insert(
  *
  * If we are called with the aborted flag set, it is because a log write during
  * a CIL checkpoint commit has failed. In this case, all the items in the
- * checkpoint have already gone through iop_commited and iop_unlock, which
+ * checkpoint have already gone through iop_committed and iop_committing, which
  * means that checkpoint commit abort handling is treated exactly the same
  * as an iclog write error even though we haven't started any IO yet. Hence in
  * this case all we need to do is iop_committed processing, followed by an
@@ -833,7 +829,7 @@ xfs_trans_committed_bulk(
         struct xfs_ail          *ailp,
         struct xfs_log_vec      *log_vector,
         xfs_lsn_t               commit_lsn,
-        int                     aborted)
+        bool                    aborted)
 {
 #define LOG_ITEM_BATCH_SIZE     32
         struct xfs_log_item     *log_items[LOG_ITEM_BATCH_SIZE];
@@ -852,7 +848,16 @@ xfs_trans_committed_bulk(
 
                 if (aborted)
                         set_bit(XFS_LI_ABORTED, &lip->li_flags);
-                item_lsn = lip->li_ops->iop_committed(lip, commit_lsn);
+
+                if (lip->li_ops->flags & XFS_ITEM_RELEASE_WHEN_COMMITTED) {
+                        lip->li_ops->iop_release(lip);
+                        continue;
+                }
+
+                if (lip->li_ops->iop_committed)
+                        item_lsn = lip->li_ops->iop_committed(lip, commit_lsn);
+                else
+                        item_lsn = commit_lsn;
 
                 /* item_lsn of -1 means the item needs no further processing */
                 if (XFS_LSN_CMP(item_lsn, (xfs_lsn_t)-1) == 0)
@@ -864,7 +869,8 @@ xfs_trans_committed_bulk(
                  */
                 if (aborted) {
                         ASSERT(XFS_FORCED_SHUTDOWN(ailp->ail_mount));
-                        lip->li_ops->iop_unpin(lip, 1);
+                        if (lip->li_ops->iop_unpin)
+                                lip->li_ops->iop_unpin(lip, 1);
                         continue;
                 }
 
@@ -882,7 +888,8 @@ xfs_trans_committed_bulk(
                                 xfs_trans_ail_update(ailp, lip, item_lsn);
                         else
                                 spin_unlock(&ailp->ail_lock);
-                        lip->li_ops->iop_unpin(lip, 0);
+                        if (lip->li_ops->iop_unpin)
+                                lip->li_ops->iop_unpin(lip, 0);
                         continue;
                 }
 
@@ -998,7 +1005,7 @@ out_unreserve:
                 tp->t_ticket = NULL;
         }
         current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS);
-        xfs_trans_free_items(tp, NULLCOMMITLSN, !!error);
+        xfs_trans_free_items(tp, !!error);
         xfs_trans_free(tp);
 
         XFS_STATS_INC(mp, xs_trans_empty);
@@ -1060,7 +1067,7 @@ xfs_trans_cancel(
         /* mark this thread as no longer being in a transaction */
         current_restore_flags_nested(&tp->t_pflags, PF_MEMALLOC_NOFS);
 
-        xfs_trans_free_items(tp, NULLCOMMITLSN, dirty);
+        xfs_trans_free_items(tp, dirty);
         xfs_trans_free(tp);
 }