GFS2: Remove bd_list_tr

This is another clean up in the logging code. This per-transaction
list was largely unused. Its main function was to ensure that the
number of buffers in a transaction was correct, however that counter
was only used to check the number of buffers in the bd_list_tr, plus
an assert at the end of each transaction. With the assert now changed
to use the calculated buffer counts, we can remove both bd_list_tr and
its associated counter.

This should make the code easier to understand as well as shrinking
a couple of structures.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

1 files changed, 1 insertions, 13 deletions

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 7882671bfe09..e9709dabc267 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -396,12 +396,8 @@ static void buf_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le)
 
         lock_buffer(bd->bd_bh);
         gfs2_log_lock(sdp);
-        if (!list_empty(&bd->bd_list_tr))
-                goto out;
         tr = current->journal_info;
         tr->tr_touched = 1;
-        tr->tr_num_buf++;
-        list_add(&bd->bd_list_tr, &tr->tr_list_buf);
         if (!list_empty(&le->le_list))
                 goto out;
         set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
@@ -781,18 +777,10 @@ static void databuf_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le)
 
         lock_buffer(bd->bd_bh);
         gfs2_log_lock(sdp);
-        if (tr) {
-                if (!list_empty(&bd->bd_list_tr))
-                        goto out;
+        if (tr)
                 tr->tr_touched = 1;
-                if (gfs2_is_jdata(ip)) {
-                        tr->tr_num_buf++;
-                        list_add(&bd->bd_list_tr, &tr->tr_list_buf);
-                }
-        }
         if (!list_empty(&le->le_list))
                 goto out;
-
         set_bit(GLF_LFLUSH, &bd->bd_gl->gl_flags);
         set_bit(GLF_DIRTY, &bd->bd_gl->gl_flags);
         if (gfs2_is_jdata(ip)) {