[GFS2] Make journaled data files identical to normal files on disk

[linux-block.git] / fs / gfs2 / trans.c

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 82952fb64830bc9c0c9b0b8fa30205e263e2d22e..104e664fa182d27c8e6c9de0a4c472c423edc1db 100644 (file)
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -151,17 +151,16 @@ void gfs2_trans_add_bh(struct gfs2_glock *gl, struct buffer_head *bh, int meta)
        if (bd)
                gfs2_assert(sdp, bd->bd_gl == gl);
        else {
-               gfs2_meta_attach_bufdata(gl, bh);
+               gfs2_attach_bufdata(gl, bh, meta);
                bd = get_v2bd(bh);
        }
-
        lops_add(sdp, &bd->bd_le);
 }
 
 void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, uint64_t blkno)
 {
        struct gfs2_revoke *rv = kmalloc(sizeof(struct gfs2_revoke),
-                                        GFP_KERNEL | __GFP_NOFAIL);
+                                        GFP_NOFS | __GFP_NOFAIL);
        lops_init_le(&rv->rv_le, &gfs2_revoke_lops);
        rv->rv_blkno = blkno;
        lops_add(sdp, &rv->rv_le);
@@ -197,19 +196,3 @@ void gfs2_trans_add_rg(struct gfs2_rgrpd *rgd)
        lops_add(rgd->rd_sbd, &rgd->rd_le);
 }
 
-void gfs2_trans_add_databuf(struct gfs2_sbd *sdp, struct buffer_head *bh)
-{
-       struct gfs2_databuf *db;
-
-       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);
-               get_bh(bh);
-               db->db_bh = bh;
-               set_v2db(bh, db);
-               lops_add(sdp, &db->db_le);
-       }
-}
-