gfs2: Pass resource group to rgblk_free

Function rgblk_free can only deal with one resource group at a time, so
pass that resource group is as a parameter.  Several of the callers
already have the resource group at hand, so we only need additional
lookup code in a few places.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Reviewed-by: Steven Whitehouse <swhiteho@redhat.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 87a6dee88a62..daa14ab4e31b 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -2042,6 +2042,8 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
         bh = leaf_bh;
 
         for (blk = leaf_no; blk; blk = nblk) {
+                struct gfs2_rgrpd *rgd;
+
                 if (blk != leaf_no) {
                         error = get_leaf(dip, blk, &bh);
                         if (error)
@@ -2052,7 +2054,8 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
                 if (blk != leaf_no)
                         brelse(bh);
 
-                gfs2_free_meta(dip, blk, 1);
+                rgd = gfs2_blk2rgrpd(sdp, blk, true);
+                gfs2_free_meta(dip, rgd, blk, 1);
                 gfs2_add_inode_blocks(&dip->i_inode, -1);
         }