1 files changed, 5 insertions, 3 deletions

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 19bde40b4864..3df65c9ab73b 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -332,9 +332,6 @@ struct gfs2_rgrpd *gfs2_blk2rgrpd(struct gfs2_sbd *sdp, u64 blk, bool exact)
         struct rb_node *n, *next;
         struct gfs2_rgrpd *cur;
 
-        if (gfs2_rindex_update(sdp))
-                return NULL;
-
         spin_lock(&sdp->sd_rindex_spin);
         n = sdp->sd_rindex_tree.rb_node;
         while (n) {
@@ -640,6 +637,7 @@ static int read_rindex_entry(struct gfs2_inode *ip,
                 return 0;
 
         error = 0; /* someone else read in the rgrp; free it and ignore it */
+        gfs2_glock_put(rgd->rd_gl);
 
 fail:
         kfree(rgd->rd_bits);
@@ -927,6 +925,10 @@ int gfs2_fitrim(struct file *filp, void __user *argp)
         } else if (copy_from_user(&r, argp, sizeof(r)))
                 return -EFAULT;
 
+        ret = gfs2_rindex_update(sdp);
+        if (ret)
+                return ret;
+
         rgd = gfs2_blk2rgrpd(sdp, r.start, 0);
         rgd_end = gfs2_blk2rgrpd(sdp, r.start + r.len, 0);