[Cluster-devel] [PATCH 06/12] gfs2: Clean up ail2_empty

[Andreas Gruenbacher]

Clean up the logic in ail2_empty (no functional change).

Signed-off-by: Andreas Gruenbacher <agrue...@redhat.com>
---
 fs/gfs2/log.c | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index f7c225520c38..33f7b1544958 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -367,29 +367,33 @@ static void gfs2_ail_empty_tr(struct gfs2_sbd *sdp, 
struct gfs2_trans *tr,
        }
 }
 
+static void __ail2_empty(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
+{
+       gfs2_ail_empty_tr(sdp, tr, &tr->tr_ail2_list);
+       list_del(&tr->tr_list);
+       gfs2_assert_warn(sdp, list_empty(&tr->tr_ail1_list));
+       gfs2_assert_warn(sdp, list_empty(&tr->tr_ail2_list));
+       gfs2_trans_free(sdp, tr);
+}
+
 static void ail2_empty(struct gfs2_sbd *sdp, unsigned int new_tail)
 {
-       struct gfs2_trans *tr, *safe;
+       struct list_head *ail2_list = &sdp->sd_ail2_list;
        unsigned int old_tail = sdp->sd_log_tail;
-       int wrap = (new_tail < old_tail);
-       int a, b, rm;
+       struct gfs2_trans *tr, *safe;
 
        spin_lock(&sdp->sd_ail_lock);
-
-       list_for_each_entry_safe(tr, safe, &sdp->sd_ail2_list, tr_list) {
-               a = (old_tail <= tr->tr_first);
-               b = (tr->tr_first < new_tail);
-               rm = (wrap) ? (a || b) : (a && b);
-               if (!rm)
-                       continue;
-
-               gfs2_ail_empty_tr(sdp, tr, &tr->tr_ail2_list);
-               list_del(&tr->tr_list);
-               gfs2_assert_warn(sdp, list_empty(&tr->tr_ail1_list));
-               gfs2_assert_warn(sdp, list_empty(&tr->tr_ail2_list));
-               gfs2_trans_free(sdp, tr);
+       if (old_tail <= new_tail) {
+               list_for_each_entry_safe(tr, safe, ail2_list, tr_list) {
+                       if (old_tail <= tr->tr_first && tr->tr_first < new_tail)
+                               __ail2_empty(sdp, tr);
+               }
+       } else {
+               list_for_each_entry_safe(tr, safe, ail2_list, tr_list) {
+                       if (old_tail <= tr->tr_first || tr->tr_first < new_tail)
+                               __ail2_empty(sdp, tr);
+               }
        }
-
        spin_unlock(&sdp->sd_ail_lock);
 }
 
-- 
2.26.2