Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbb27873 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

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: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent a5b1d3fc

fs/gfs2/bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ int gfs2_unstuff_dinode(struct gfs2_inode *ip, struct page *page) 
		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;
@@ -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))

			gfs2_trans_add_unrevoke(sdp, bn, n);

			gfs2_trans_remove_revoke(sdp, bn, n);

		switch (state) {

		/* Growing height of tree */

		case ALLOC_GROW_HEIGHT:

fs/gfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ static struct gfs2_leaf *new_leaf(struct inode *inode, struct buffer_head **pbh, 
	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;

fs/gfs2/rgrp.c

+1 −1
Original line number Diff line number Diff line
@@ -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_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);

fs/gfs2/trans.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) 
	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;

fs/gfs2/trans.h

+1 −1
Original line number Diff line number Diff line
@@ -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_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__ */