From 2ccedd395d15edcd290d4b0136cc0c263fd6e858 Mon Sep 17 00:00:00 2001 From: Bob Peterson Date: Wed, 16 Nov 2011 17:50:37 -0500 Subject: [PATCH] --- yaml --- r: 280335 b: refs/heads/master c: b9f417f311a7141d0ba67e5c8e535010d2712f2d h: refs/heads/master i: 280333: eed940b57884741bc6ca1c5b6c264570c2d0352b 280331: 32ddcbb0159a697e3b6b6335751eb6825d38cf09 280327: 26de5a955fe8a4d901bbd6d8467022c4af9b873f 280319: 3f3315a313bbda9f1266e0438c0e9730657774c9 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/incore.h | 1 - trunk/fs/gfs2/rgrp.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6cfc7d9efb37..5c062a2171f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c5d785acfda7dffa63477951bb6864c6a49ed2e +refs/heads/master: b9f417f311a7141d0ba67e5c8e535010d2712f2d diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h index 7389dfdcc9ef..32f5beccb74b 100644 --- a/trunk/fs/gfs2/incore.h +++ b/trunk/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/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c index 995f4e674489..855597abc5e7 100644 --- a/trunk/fs/gfs2/rgrp.c +++ b/trunk/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);