1 files changed, 25 insertions, 19 deletions

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 86ac75d99d31..ad3e2fb763d7 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -50,8 +50,6 @@ int gfs2_trans_begin(struct gfs2_sbd *sdp, unsigned int blocks,
         if (revokes)
                 tr->tr_reserved += gfs2_struct2blk(sdp, revokes,
                                                    sizeof(u64));
-        INIT_LIST_HEAD(&tr->tr_list_buf);
-
         gfs2_holder_init(sdp->sd_trans_gl, LM_ST_SHARED, 0, &tr->tr_t_gh);
 
         error = gfs2_glock_nq(&tr->tr_t_gh);
@@ -93,10 +91,21 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)
         up_read(&sdp->sd_log_flush_lock);
 }
 
+static void gfs2_print_trans(const struct gfs2_trans *tr)
+{
+        print_symbol(KERN_WARNING "GFS2: Transaction created at: %s\n", tr->tr_ip);
+        printk(KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n",
+               tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched);
+        printk(KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n",
+               tr->tr_num_buf_new, tr->tr_num_buf_rm,
+               tr->tr_num_databuf_new, tr->tr_num_databuf_rm,
+               tr->tr_num_revoke, tr->tr_num_revoke_rm);
+}
+
 void gfs2_trans_end(struct gfs2_sbd *sdp)
 {
         struct gfs2_trans *tr = current->journal_info;
-
+        s64 nbuf;
         BUG_ON(!tr);
         current->journal_info = NULL;
 
@@ -110,16 +119,13 @@ void gfs2_trans_end(struct gfs2_sbd *sdp)
                 return;
         }
 
-        if (gfs2_assert_withdraw(sdp, tr->tr_num_buf <= tr->tr_blocks)) {
-                fs_err(sdp, "tr_num_buf = %u, tr_blocks = %u ",
-                       tr->tr_num_buf, tr->tr_blocks);
-                print_symbol(KERN_WARNING "GFS2: Transaction created at: %s\n", tr->tr_ip);
-        }
-        if (gfs2_assert_withdraw(sdp, tr->tr_num_revoke <= tr->tr_revokes)) {
-                fs_err(sdp, "tr_num_revoke = %u, tr_revokes = %u ",
-                       tr->tr_num_revoke, tr->tr_revokes);
-                print_symbol(KERN_WARNING "GFS2: Transaction created at: %s\n", tr->tr_ip);
-        }
+        nbuf = tr->tr_num_buf_new + tr->tr_num_databuf_new;
+        nbuf -= tr->tr_num_buf_rm;
+        nbuf -= tr->tr_num_databuf_rm;
+
+        if (gfs2_assert_withdraw(sdp, (nbuf <= tr->tr_blocks) &&
+                                       (tr->tr_num_revoke <= tr->tr_revokes)))
+                gfs2_print_trans(tr);
 
         gfs2_log_commit(sdp, tr);
         if (tr->tr_t_gh.gh_gl) {
@@ -152,16 +158,16 @@ void gfs2_trans_add_bh(struct gfs2_glock *gl, struct buffer_head *bh, int meta)
                 gfs2_attach_bufdata(gl, bh, meta);
                 bd = bh->b_private;
         }
-        lops_add(sdp, &bd->bd_le);
+        lops_add(sdp, bd);
 }
 
 void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
 {
-        BUG_ON(!list_empty(&bd->bd_le.le_list));
+        BUG_ON(!list_empty(&bd->bd_list));
         BUG_ON(!list_empty(&bd->bd_ail_st_list));
         BUG_ON(!list_empty(&bd->bd_ail_gl_list));
-        lops_init_le(&bd->bd_le, &gfs2_revoke_lops);
-        lops_add(sdp, &bd->bd_le);
+        lops_init_le(bd, &gfs2_revoke_lops);
+        lops_add(sdp, bd);
 }
 
 void gfs2_trans_add_unrevoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len)
@@ -171,9 +177,9 @@ void gfs2_trans_add_unrevoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len)
         unsigned int n = len;
 
         gfs2_log_lock(sdp);
-        list_for_each_entry_safe(bd, tmp, &sdp->sd_log_le_revoke, bd_le.le_list) {
+        list_for_each_entry_safe(bd, tmp, &sdp->sd_log_le_revoke, bd_list) {
                 if ((bd->bd_blkno >= blkno) && (bd->bd_blkno < (blkno + len))) {
-                        list_del_init(&bd->bd_le.le_list);
+                        list_del_init(&bd->bd_list);
                         gfs2_assert_withdraw(sdp, sdp->sd_log_num_revoke);
                         sdp->sd_log_num_revoke--;
                         kmem_cache_free(gfs2_bufdata_cachep, bd);