1 files changed, 13 insertions, 9 deletions

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 55ef72dc5b13..7474c413ffd1 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -2097,7 +2097,7 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart,
                                      u32 blen, unsigned char new_state)
 {
         struct gfs2_rbm rbm;
-        struct gfs2_bitmap *bi;
+        struct gfs2_bitmap *bi, *bi_prev = NULL;
 
         rbm.rgd = gfs2_blk2rgrpd(sdp, bstart, 1);
         if (!rbm.rgd) {
@@ -2106,18 +2106,22 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart,
                 return NULL;
         }
 
+        gfs2_rbm_from_block(&rbm, bstart);
         while (blen--) {
-                gfs2_rbm_from_block(&rbm, bstart);
                 bi = rbm_bi(&rbm);
-                bstart++;
-                if (!bi->bi_clone) {
-                        bi->bi_clone = kmalloc(bi->bi_bh->b_size,
-                                               GFP_NOFS | __GFP_NOFAIL);
-                        memcpy(bi->bi_clone + bi->bi_offset,
-                               bi->bi_bh->b_data + bi->bi_offset, bi->bi_len);
+                if (bi != bi_prev) {
+                        if (!bi->bi_clone) {
+                                bi->bi_clone = kmalloc(bi->bi_bh->b_size,
+                                                      GFP_NOFS | __GFP_NOFAIL);
+                                memcpy(bi->bi_clone + bi->bi_offset,
+                                       bi->bi_bh->b_data + bi->bi_offset,
+                                       bi->bi_len);
+                        }
+                        gfs2_trans_add_meta(rbm.rgd->rd_gl, bi->bi_bh);
+                        bi_prev = bi;
                 }
-                gfs2_trans_add_meta(rbm.rgd->rd_gl, bi->bi_bh);
                 gfs2_setbit(&rbm, false, new_state);
+                gfs2_rbm_incr(&rbm);
         }
 
         return rbm.rgd;