From: Bob Peterson Date: Wed, 16 Nov 2011 22:50:37 +0000 (-0500) Subject: GFS2: remove vestigial al_alloced X-Git-Tag: firefly_0821_release~3680^2~3820^2~8 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b9f417f311a7141d0ba67e5c8e535010d2712f2d;p=firefly-linux-kernel-4.4.55.git GFS2: remove vestigial al_alloced This patch removes the vestigial variable al_alloced from the gfs2_alloc structure. This is another baby step toward multi-block reservations. My next planned step is to decouple the quota variables from the gfs2_alloc structure so we can use a different method for allocations. Signed-off-by: Bob Peterson Signed-off-by: Steven Whitehouse --- diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 7389dfdcc9ef..32f5beccb74b 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -251,7 +251,6 @@ struct gfs2_alloc { unsigned int al_qd_num; u32 al_requested; /* Filled in by caller of gfs2_inplace_reserve() */ - u32 al_alloced; /* Filled in by gfs2_alloc_*() */ /* Filled in by gfs2_inplace_reserve() */ struct gfs2_holder al_rgd_gh; diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 995f4e674489..855597abc5e7 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -1372,8 +1372,6 @@ int gfs2_alloc_block(struct gfs2_inode *ip, u64 *bn, unsigned int *n, gfs2_trans_add_bh(rgd->rd_gl, rgd->rd_bits[0].bi_bh, 1); gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data); - al->al_alloced += *n; - gfs2_statfs_change(sdp, 0, -(s64)*n, dinode ? 1 : 0); if (dinode) gfs2_trans_add_unrevoke(sdp, block, 1);