---

yaml --- r: 292395 b: refs/heads/master c: 35e478f h: refs/heads/master i: 292393: d5cd12a 292391: 3510a84 v: v3
git-mirror · Mar 7, 2012 · b256b4f · b256b4f
1 parent 1a33660
commit b256b4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;