---

yaml --- r: 156109 b: refs/heads/master c: a51b56f h: refs/heads/master i: 156107: 3160d6b v: v3
git-mirror · Jul 30, 2009 · d665531 · d665531
1 parent 982d0b7
commit d665531
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1946f70ab5e4eb8b54a8eaaedba2293a3750ab7e
+refs/heads/master: a51b56fff3f04fc5aa66b21a2a6d693ee9862d66
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
@@ -1314,6 +1314,10 @@ static int gfs2_shrink_glock_memory(int nr, gfp_t gfp_mask)
 		list_del_init(&gl->gl_lru);
 		atomic_dec(&lru_count);
 
+		/* Check if glock is about to be freed */
+		if (atomic_read(&gl->gl_ref) == 0)
+			continue;
+
 		/* Test for being demotable */
 		if (!test_and_set_bit(GLF_LOCK, &gl->gl_flags)) {
 			gfs2_glock_hold(gl);