From b56cfcf8c826e062d366af9d74876dd43cd7a393 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Wed, 23 Jun 2010 11:44:47 -0400
Subject: [PATCH] --- yaml --- r: 201008 b: refs/heads/master c:
 b7dc2df5725fe7355fd76000ead7e39728e1b8a9 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/fs/gfs2/glock.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 61ad563ed449..d27d36c33e31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8bf2bc212e129dd59a8b06cdbc15079cc3bd876
+refs/heads/master: b7dc2df5725fe7355fd76000ead7e39728e1b8a9
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index ddcdbf493536..dbab3fdc2582 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/fs/gfs2/glock.c
@@ -706,8 +706,18 @@ static void glock_work_func(struct work_struct *work)
 {
 	unsigned long delay = 0;
 	struct gfs2_glock *gl = container_of(work, struct gfs2_glock, gl_work.work);
+	struct gfs2_holder *gh;
 	int drop_ref = 0;
 
+	if (unlikely(test_bit(GLF_FROZEN, &gl->gl_flags))) {
+		spin_lock(&gl->gl_spin);
+		gh = find_first_waiter(gl);
+		if (gh && (gh->gh_flags & LM_FLAG_NOEXP) &&
+		    test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))
+			set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
+		spin_unlock(&gl->gl_spin);
+	}
+
 	if (test_and_clear_bit(GLF_REPLY_PENDING, &gl->gl_flags)) {
 		finish_xmote(gl, gl->gl_reply);
 		drop_ref = 1;