[GFS2] Merge gfs2_alloc_meta and gfs2_alloc_data

[cascardo/linux.git] / fs / gfs2 / eattr.c

diff --git a/fs/gfs2/eattr.c b/fs/gfs2/eattr.c
index bee9970..f9f63bc 100644 (file)
--- a/fs/gfs2/eattr.c
+++ b/fs/gfs2/eattr.c
@@ -584,8 +584,8 @@ static int ea_alloc_blk(struct gfs2_inode *ip, struct buffer_head **bhp)
        struct gfs2_ea_header *ea;
        u64 block;
 
-       block = gfs2_alloc_meta(ip);
-
+       block = gfs2_alloc_block(ip);
+       gfs2_trans_add_unrevoke(sdp, block, 1);
        *bhp = gfs2_meta_new(ip->i_gl, block);
        gfs2_trans_add_bh(ip->i_gl, *bhp, 1);
        gfs2_metatype_set(*bhp, GFS2_METATYPE_EA, GFS2_FORMAT_EA);
@@ -643,8 +643,8 @@ static int ea_write(struct gfs2_inode *ip, struct gfs2_ea_header *ea,
                        u64 block;
                        int mh_size = sizeof(struct gfs2_meta_header);
 
-                       block = gfs2_alloc_meta(ip);
-
+                       block = gfs2_alloc_block(ip);
+                       gfs2_trans_add_unrevoke(sdp, block, 1);
                        bh = gfs2_meta_new(ip->i_gl, block);
                        gfs2_trans_add_bh(ip->i_gl, bh, 1);
                        gfs2_metatype_set(bh, GFS2_METATYPE_ED, GFS2_FORMAT_ED);
@@ -967,8 +967,8 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er,
        } else {
                u64 blk;
 
-               blk = gfs2_alloc_meta(ip);
-
+               blk = gfs2_alloc_block(ip);
+               gfs2_trans_add_unrevoke(sdp, blk, 1);
                indbh = gfs2_meta_new(ip->i_gl, blk);
                gfs2_trans_add_bh(ip->i_gl, indbh, 1);
                gfs2_metatype_set(indbh, GFS2_METATYPE_IN, GFS2_FORMAT_IN);
@@ -1347,7 +1347,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
        else
                goto out;
 
-       gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE, 0);
+       gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE);
 
        for (x = 0; x < rlist.rl_rgrps; x++) {
                struct gfs2_rgrpd *rgd;