[GFS2] Replace revoke structure with bufdata structure

Both the revoke structure and the bufdata structure are quite similar.
They are basically small tags which are put on lists. In addition to
which the revoke structure is always allocated when there is a bufdata
structure which is (or can be) freed. As such it should be possible to
reduce the number of frees and allocations by using the same structure
for both purposes.

This patch is the first step along that path. It replaces existing uses
of the revoke structure with the bufdata structure.

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

1 files changed, 10 insertions, 10 deletions

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index f8dabf8446bb..eadf96e00510 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -144,23 +144,23 @@ void gfs2_trans_add_bh(struct gfs2_glock *gl, struct buffer_head *bh, int meta)
 
 void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, u64 blkno)
 {
-        struct gfs2_revoke *rv = kmalloc(sizeof(struct gfs2_revoke),
-                                         GFP_NOFS | __GFP_NOFAIL);
-        lops_init_le(&rv->rv_le, &gfs2_revoke_lops);
-        rv->rv_blkno = blkno;
-        lops_add(sdp, &rv->rv_le);
+        struct gfs2_bufdata *bd = kmalloc(sizeof(struct gfs2_bufdata),
+                                          GFP_NOFS | __GFP_NOFAIL);
+        lops_init_le(&bd->bd_le, &gfs2_revoke_lops);
+        bd->bd_blkno = blkno;
+        lops_add(sdp, &bd->bd_le);
 }
 
 void gfs2_trans_add_unrevoke(struct gfs2_sbd *sdp, u64 blkno)
 {
-        struct gfs2_revoke *rv;
+        struct gfs2_bufdata *bd;
         int found = 0;
 
         gfs2_log_lock(sdp);
 
-        list_for_each_entry(rv, &sdp->sd_log_le_revoke, rv_le.le_list) {
-                if (rv->rv_blkno == blkno) {
-                        list_del(&rv->rv_le.le_list);
+        list_for_each_entry(bd, &sdp->sd_log_le_revoke, bd_le.le_list) {
+                if (bd->bd_blkno == blkno) {
+                        list_del(&bd->bd_le.le_list);
                         gfs2_assert_withdraw(sdp, sdp->sd_log_num_revoke);
                         sdp->sd_log_num_revoke--;
                         found = 1;
@@ -172,7 +172,7 @@ void gfs2_trans_add_unrevoke(struct gfs2_sbd *sdp, u64 blkno)
 
         if (found) {
                 struct gfs2_trans *tr = current->journal_info;
-                kfree(rv);
+                kfree(bd);
                 tr->tr_num_revoke_rm++;
         }
 }