aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2018-08-08 10:53:30 -0400
committerBob Peterson <rpeterso@redhat.com>2018-08-08 11:34:39 -0400
commitf5580d0f8bf60993a5fbc73ee04678070ffbba57 (patch)
tree8a7d502edacd65b939e0df7a33833b3ff55e7b92
parentdffe12a82826082d2129ef91b17b257254cb60fc (diff)
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: Bob Peterson <rpeterso@redhat.com> Reviewed-by: Andrew Price <anprice@redhat.com>
-rw-r--r--fs/gfs2/rgrp.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index ef50fe9b880a..1ad3256b9cbc 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1111,13 +1111,6 @@ static int gfs2_rgrp_lvb_valid(struct gfs2_rgrpd *rgd)
1111 return 1; 1111 return 1;
1112} 1112}
1113 1113
1114static void update_rgrp_lvb_unlinked(struct gfs2_rgrpd *rgd, u32 change)
1115{
1116 struct gfs2_rgrp_lvb *rgl = rgd->rd_rgl;
1117 u32 unlinked = be32_to_cpu(rgl->rl_unlinked) + change;
1118 rgl->rl_unlinked = cpu_to_be32(unlinked);
1119}
1120
1121static u32 count_unlinked(struct gfs2_rgrpd *rgd) 1114static u32 count_unlinked(struct gfs2_rgrpd *rgd)
1122{ 1115{
1123 struct gfs2_bitmap *bi; 1116 struct gfs2_bitmap *bi;
@@ -2489,7 +2482,7 @@ void gfs2_unlink_di(struct inode *inode)
2489 trace_gfs2_block_alloc(ip, rgd, blkno, 1, GFS2_BLKST_UNLINKED); 2482 trace_gfs2_block_alloc(ip, rgd, blkno, 1, GFS2_BLKST_UNLINKED);
2490 gfs2_trans_add_meta(rgd->rd_gl, rgd->rd_bits[0].bi_bh); 2483 gfs2_trans_add_meta(rgd->rd_gl, rgd->rd_bits[0].bi_bh);
2491 gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data); 2484 gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data);
2492 update_rgrp_lvb_unlinked(rgd, 1); 2485 be32_add_cpu(&rgd->rd_rgl->rl_unlinked, 1);
2493} 2486}
2494 2487
2495void gfs2_free_di(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip) 2488void 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)
2509 2502
2510 gfs2_trans_add_meta(rgd->rd_gl, rgd->rd_bits[0].bi_bh); 2503 gfs2_trans_add_meta(rgd->rd_gl, rgd->rd_bits[0].bi_bh);
2511 gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data); 2504 gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data);
2512 update_rgrp_lvb_unlinked(rgd, -1); 2505 be32_add_cpu(&rgd->rd_rgl->rl_unlinked, -1);
2513 2506
2514 gfs2_statfs_change(sdp, 0, +1, -1); 2507 gfs2_statfs_change(sdp, 0, +1, -1);
2515 trace_gfs2_block_alloc(ip, rgd, ip->i_no_addr, 1, GFS2_BLKST_FREE); 2508 trace_gfs2_block_alloc(ip, rgd, ip->i_no_addr, 1, GFS2_BLKST_FREE);