[Cluster-devel] [GFS2 PATCH] GFS2: remove vestigial al_alloced

[Cluster-devel] [GFS2 PATCH] GFS2: remove vestigial al_alloced

[Bob Peterson]

Hi,

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.

Regards,

Bob Peterson
Red Hat File Systems
--
 fs/gfs2/incore.h |    1 -
 fs/gfs2/rgrp.c   |    2 --
 2 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 7389dfd..32f5bec 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 f67610e..e801083 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1387,8 +1387,6 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *ndata,
 	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 += (*ndata) + dinode;
-
 	gfs2_statfs_change(sdp, 0, (-(s64)((*ndata) + dinode)), dinode);
 	if (dinode)
 		gfs2_trans_add_unrevoke(sdp, block, 1);

[Cluster-devel] [GFS2 PATCH] GFS2: remove vestigial al_alloced

[Steven Whitehouse]

Hi,

Applied to the -nmw tree, thanks. Please remember to add Signed-off-by
lines in future though - I've added it for you in this case,

Steve.

On Wed, 2011-11-16 at 17:50 -0500, Bob Peterson wrote:
> Hi,
> 
> 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.
> 
> Regards,
> 
> Bob Peterson
> Red Hat File Systems
> --
>  fs/gfs2/incore.h |    1 -
>  fs/gfs2/rgrp.c   |    2 --
>  2 files changed, 0 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
> index 7389dfd..32f5bec 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 f67610e..e801083 100644
> --- a/fs/gfs2/rgrp.c
> +++ b/fs/gfs2/rgrp.c
> @@ -1387,8 +1387,6 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *ndata,
>  	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 += (*ndata) + dinode;
> -
>  	gfs2_statfs_change(sdp, 0, (-(s64)((*ndata) + dinode)), dinode);
>  	if (dinode)
>  		gfs2_trans_add_unrevoke(sdp, block, 1);
>