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

Commit b9f417f3 authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

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: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 3c5d785a

fs/gfs2/incore.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -251,7 +251,6 @@ struct gfs2_alloc { 
	unsigned int al_qd_num;

	unsigned int al_qd_num;





	u32 al_requested; /* Filled in by caller of gfs2_inplace_reserve() */

	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() */

	/* Filled in by gfs2_inplace_reserve() */

	struct gfs2_holder al_rgd_gh;

	struct gfs2_holder al_rgd_gh;

fs/gfs2/rgrp.c

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

	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);

	gfs2_statfs_change(sdp, 0, -(s64)*n, dinode ? 1 : 0);

	if (dinode)

	if (dinode)

		gfs2_trans_add_unrevoke(sdp, block, 1);

		gfs2_trans_add_unrevoke(sdp, block, 1);