Commit f5580d0f authored by Bob Peterson's avatar Bob Peterson
Browse files

gfs2: eliminate update_rgrp_lvb_unlinked 



Function update_rgrp_lvb_unlinked used to do the same thing as
be32_add_cpu. This patch removes it in favor of using be32_add_cpu
directly.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Reviewed-by: default avatarAndrew Price <anprice@redhat.com>
parent dffe12a8

fs/gfs2/rgrp.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -1111,13 +1111,6 @@ static int gfs2_rgrp_lvb_valid(struct gfs2_rgrpd *rgd) 
	return 1;

	return 1;

}

}





static void update_rgrp_lvb_unlinked(struct gfs2_rgrpd *rgd, u32 change)

{

	struct gfs2_rgrp_lvb *rgl = rgd->rd_rgl;

	u32 unlinked = be32_to_cpu(rgl->rl_unlinked) + change;

	rgl->rl_unlinked = cpu_to_be32(unlinked);

}



static u32 count_unlinked(struct gfs2_rgrpd *rgd)

static u32 count_unlinked(struct gfs2_rgrpd *rgd)

{

{

	struct gfs2_bitmap *bi;

	struct gfs2_bitmap *bi;
@@ -2489,7 +2482,7 @@ void gfs2_unlink_di(struct inode *inode) 
	trace_gfs2_block_alloc(ip, rgd, blkno, 1, GFS2_BLKST_UNLINKED);

	trace_gfs2_block_alloc(ip, rgd, blkno, 1, GFS2_BLKST_UNLINKED);

	gfs2_trans_add_meta(rgd->rd_gl, rgd->rd_bits[0].bi_bh);

	gfs2_trans_add_meta(rgd->rd_gl, rgd->rd_bits[0].bi_bh);

	gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data);

	gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data);

	update_rgrp_lvb_unlinked(rgd, 1);

	be32_add_cpu(&rgd->rd_rgl->rl_unlinked, 1);

}

}





void gfs2_free_di(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip)

void gfs2_free_di(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip)
@@ -2509,7 +2502,7 @@ void gfs2_free_di(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip) 




	gfs2_trans_add_meta(rgd->rd_gl, rgd->rd_bits[0].bi_bh);

	gfs2_trans_add_meta(rgd->rd_gl, rgd->rd_bits[0].bi_bh);

	gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data);

	gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data);

	update_rgrp_lvb_unlinked(rgd, -1);

	be32_add_cpu(&rgd->rd_rgl->rl_unlinked, -1);





	gfs2_statfs_change(sdp, 0, +1, -1);

	gfs2_statfs_change(sdp, 0, +1, -1);

	trace_gfs2_block_alloc(ip, rgd, ip->i_no_addr, 1, GFS2_BLKST_FREE);

	trace_gfs2_block_alloc(ip, rgd, ip->i_no_addr, 1, GFS2_BLKST_FREE);