[GFS2] Remove gfs2_databuf in favour of gfs2_bufdata structure

Removing the gfs2_databuf structure and using gfs2_bufdata instead
is a step towards allowing journaling of data without requiring the
metadata header on each journaled block. The idea is to merge the
code paths for ordered data with that of journaled data, with the
log operations in lops.c tacking account of the different types of
buffers as they are presented to it. Largely the code path for
metadata will be similar too, but obviously through a different set
of log operations.

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

1 files changed, 9 insertions, 9 deletions

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index a9df4a34ebad..b014591fa4a4 100644
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -199,17 +199,17 @@ void gfs2_trans_add_rg(struct gfs2_rgrpd *rgd)
 
 void gfs2_trans_add_databuf(struct gfs2_sbd *sdp, struct buffer_head *bh)
 {
-        struct gfs2_databuf *db;
+        struct gfs2_bufdata *bd;
 
-        db = get_v2db(bh);
-        if (!db) {
-                db = kmalloc(sizeof(struct gfs2_databuf),
-                             GFP_KERNEL | __GFP_NOFAIL);
-                lops_init_le(&db->db_le, &gfs2_databuf_lops);
+        bd = get_v2bd(bh);
+        if (!bd) {
+                bd = kmalloc(sizeof(struct gfs2_bufdata),
+                             GFP_NOFS | __GFP_NOFAIL);
+                lops_init_le(&bd->bd_le, &gfs2_databuf_lops);
                 get_bh(bh);
-                db->db_bh = bh;
-                set_v2db(bh, db);
-                lops_add(sdp, &db->db_le);
+                bd->bd_bh = bh;
+                set_v2bd(bh, bd);
+                lops_add(sdp, &bd->bd_le);
         }
 }