1 files changed, 2 insertions, 1 deletions

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 4553ce515f62..6172fa77ad59 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1417,7 +1417,7 @@ static int gfs2_dinode_dealloc(struct gfs2_inode *ip)
         if (error)
                 goto out;
 
-        rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr);
+        rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr, 1);
         if (!rgd) {
                 gfs2_consist_inode(ip);
                 error = -EIO;
@@ -1557,6 +1557,7 @@ out:
         end_writeback(inode);
         gfs2_dir_hash_inval(ip);
         ip->i_gl->gl_object = NULL;
+        flush_delayed_work_sync(&ip->i_gl->gl_work);
         gfs2_glock_add_to_lru(ip->i_gl);
         gfs2_glock_put(ip->i_gl);
         ip->i_gl = NULL;