diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index f3faf72fa7ae5d842d7d18ca606229cb918c29d8..6172fa77ad59acf938d7a82f12c6bd1b78735df0 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -1557,6 +1557,7 @@ static void gfs2_evict_inode(struct inode *inode)
 	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;