diff --git a/[refs] b/[refs]
index cecae1f8fd3c..f114aff7eef6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58884c4df005ee5ee854cfcd0385d5a6bf25aa30
+refs/heads/master: 35e478f42271673f79066a1ed008c6604621c6fe
diff --git a/trunk/fs/gfs2/super.c b/trunk/fs/gfs2/super.c
index f3faf72fa7ae..6172fa77ad59 100644
--- a/trunk/fs/gfs2/super.c
+++ b/trunk/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;