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 <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 7389dfdcc9ef6a9718398c258b45fbf7bba241e1..32f5beccb74bd8a43a5814643dfc27caa71693ad 100644 (file)
--- 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 995f4e674489f2252b93635511a97c7d48b5a3c2..855597abc5e76e9d979b850226d310084a7c1f5a 100644 (file)
--- 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);