gfs2: Rename gfs2_trans_{add_unrevoke => remove_revoke}

Rename gfs2_trans_add_unrevoke to gfs2_trans_remove_revoke: there is no
such thing as an "unrevoke" object; all this function does is remove
existing revoke objects plus some bookkeeping.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 59334e2edffba0631025d1e1215ba8faa98776a4..6f1f0d30fe29cea0264bb2009ecb4900661a85a0 100644 (file)
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -142,7 +142,7 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page)
                if (error)
                        goto out_brelse;
                if (isdir) {
                if (error)
                        goto out_brelse;
                if (isdir) {

-                       gfs2_trans_add_unrevoke(GFS2_SB(&ip->i_inode), block, 1);
+                       gfs2_trans_remove_revoke(GFS2_SB(&ip->i_inode), block, 1);

                        error = gfs2_dir_get_new_buffer(ip, block, &bh);
                        if (error)
                                goto out_brelse;
                        error = gfs2_dir_get_new_buffer(ip, block, &bh);
                        if (error)
                                goto out_brelse;


@@ -676,7 +676,7 @@ static int gfs2_iomap_alloc(struct inode *inode, struct iomap *iomap,
                        goto out;
                alloced += n;
                if (state != ALLOC_DATA || gfs2_is_jdata(ip))
                        goto out;
                alloced += n;
                if (state != ALLOC_DATA || gfs2_is_jdata(ip))

-                       gfs2_trans_add_unrevoke(sdp, bn, n);
+                       gfs2_trans_remove_revoke(sdp, bn, n);

                switch (state) {
                /* Growing height of tree */
                case ALLOC_GROW_HEIGHT:
                switch (state) {
                /* Growing height of tree */
                case ALLOC_GROW_HEIGHT:

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index daa14ab4e31b3eab5b39f7cf1b10eae771d14ee3..db9a05244a351c313892c2844599435781b09a59 100644 (file)
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -883,7 +883,7 @@ static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh,
        if (!bh)
                return NULL;
 
        if (!bh)
                return NULL;
 

-       gfs2_trans_add_unrevoke(GFS2_SB(inode), bn, 1);
+       gfs2_trans_remove_revoke(GFS2_SB(inode), bn, 1);

        gfs2_trans_add_meta(ip->i_gl, bh);
        gfs2_metatype_set(bh, GFS2_METATYPE_LF, GFS2_FORMAT_LF);
        leaf = (struct gfs2_leaf *)bh->b_data;
        gfs2_trans_add_meta(ip->i_gl, bh);
        gfs2_metatype_set(bh, GFS2_METATYPE_LF, GFS2_FORMAT_LF);
        leaf = (struct gfs2_leaf *)bh->b_data;

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 52a4f340a8672511a16909a0db4cc55a0d7706c7..15d6e32de55f87a7a0e0351daae622444d812eec 100644 (file)
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -2440,7 +2440,7 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks,
 
        gfs2_statfs_change(sdp, 0, -(s64)*nblocks, dinode ? 1 : 0);
        if (dinode)
 
        gfs2_statfs_change(sdp, 0, -(s64)*nblocks, dinode ? 1 : 0);
        if (dinode)

-               gfs2_trans_add_unrevoke(sdp, block, *nblocks);
+               gfs2_trans_remove_revoke(sdp, block, *nblocks);

 
        gfs2_quota_change(ip, *nblocks, ip->i_inode.i_uid, ip->i_inode.i_gid);
 
 
        gfs2_quota_change(ip, *nblocks, ip->i_inode.i_uid, ip->i_inode.i_gid);
 

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 5c4eae3b69fb0aca79c02cf7185ab047bf80d316..d328da7cde36d2d460555b8fb9ea54fd2be11030 100644 (file)
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -253,7 +253,7 @@ void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd)
        tr->tr_num_revoke++;
 }
 
        tr->tr_num_revoke++;
 }
 

-void gfs2_trans_add_unrevoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len)
+void gfs2_trans_remove_revoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len)

 {
        struct gfs2_bufdata *bd, *tmp;
        struct gfs2_trans *tr = current->journal_info;
 {
        struct gfs2_bufdata *bd, *tmp;
        struct gfs2_trans *tr = current->journal_info;

diff --git a/fs/gfs2/trans.h b/fs/gfs2/trans.h
index ad70087d059715a3217964e56a525bffe587616d..1e39f056ccb745475e36579ab84435d00bd82689 100644 (file)
--- a/fs/gfs2/trans.h
+++ b/fs/gfs2/trans.h
@@ -44,6 +44,6 @@ extern void gfs2_trans_end(struct gfs2_sbd *sdp);
 extern void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh);
 extern void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh);
 extern void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd);
 extern void gfs2_trans_add_data(struct gfs2_glock *gl, struct buffer_head *bh);
 extern void gfs2_trans_add_meta(struct gfs2_glock *gl, struct buffer_head *bh);
 extern void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd);

-extern void gfs2_trans_add_unrevoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len);
+extern void gfs2_trans_remove_revoke(struct gfs2_sbd *sdp, u64 blkno, unsigned int len);

 
 #endif /* __TRANS_DOT_H__ */
 
 #endif /* __TRANS_DOT_H__ */

diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c
index 996c915a9c97e89a1f1df4f73eefe19b02d610ec..675e704830df215c09b7ce361cefa2ac28618aa3 100644 (file)
--- a/fs/gfs2/xattr.c
+++ b/fs/gfs2/xattr.c
@@ -631,7 +631,7 @@ static int ea_alloc_blk(struct gfs2_inode *ip, struct buffer_head **bhp)
        error = gfs2_alloc_blocks(ip, &block, &n, 0, NULL);
        if (error)
                return error;
        error = gfs2_alloc_blocks(ip, &block, &n, 0, NULL);
        if (error)
                return error;

-       gfs2_trans_add_unrevoke(sdp, block, 1);
+       gfs2_trans_remove_revoke(sdp, block, 1);

        *bhp = gfs2_meta_new(ip->i_gl, block);
        gfs2_trans_add_meta(ip->i_gl, *bhp);
        gfs2_metatype_set(*bhp, GFS2_METATYPE_EA, GFS2_FORMAT_EA);
        *bhp = gfs2_meta_new(ip->i_gl, block);
        gfs2_trans_add_meta(ip->i_gl, *bhp);
        gfs2_metatype_set(*bhp, GFS2_METATYPE_EA, GFS2_FORMAT_EA);


@@ -693,7 +693,7 @@ static int ea_write(struct gfs2_inode *ip, struct gfs2_ea_header *ea,
                        error = gfs2_alloc_blocks(ip, &block, &n, 0, NULL);
                        if (error)
                                return error;
                        error = gfs2_alloc_blocks(ip, &block, &n, 0, NULL);
                        if (error)
                                return error;

-                       gfs2_trans_add_unrevoke(sdp, block, 1);
+                       gfs2_trans_remove_revoke(sdp, block, 1);

                        bh = gfs2_meta_new(ip->i_gl, block);
                        gfs2_trans_add_meta(ip->i_gl, bh);
                        gfs2_metatype_set(bh, GFS2_METATYPE_ED, GFS2_FORMAT_ED);
                        bh = gfs2_meta_new(ip->i_gl, block);
                        gfs2_trans_add_meta(ip->i_gl, bh);
                        gfs2_metatype_set(bh, GFS2_METATYPE_ED, GFS2_FORMAT_ED);


@@ -997,7 +997,7 @@ static int ea_set_block(struct gfs2_inode *ip, struct gfs2_ea_request *er,
                error = gfs2_alloc_blocks(ip, &blk, &n, 0, NULL);
                if (error)
                        return error;
                error = gfs2_alloc_blocks(ip, &blk, &n, 0, NULL);
                if (error)
                        return error;

-               gfs2_trans_add_unrevoke(sdp, blk, 1);
+               gfs2_trans_remove_revoke(sdp, blk, 1);

                indbh = gfs2_meta_new(ip->i_gl, blk);
                gfs2_trans_add_meta(ip->i_gl, indbh);
                gfs2_metatype_set(indbh, GFS2_METATYPE_IN, GFS2_FORMAT_IN);
                indbh = gfs2_meta_new(ip->i_gl, blk);
                gfs2_trans_add_meta(ip->i_gl, indbh);
                gfs2_metatype_set(indbh, GFS2_METATYPE_IN, GFS2_FORMAT_IN);