From 57d90cd943300df8166f266d2b4aa41bd193ff3d Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Thu, 29 Jul 2010 14:39:29 +0100
Subject: [PATCH] --- yaml --- r: 201825 b: refs/heads/master c:
 7cdee5dbf477409e4afc6c9063492dc2577b41ea h: refs/heads/master i:   201823:
 01a4d0468e4c5fab570c7cd8ec2543901b2601e7 v: v3

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

diff --git a/[refs] b/[refs]
index 572dcaaa0afb..e9c3098af2a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5341a92416706808dc5cd847826f28c08063c8c
+refs/heads/master: 7cdee5dbf477409e4afc6c9063492dc2577b41ea
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index 717531d1b2a8..2b3d8f8a8393 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/fs/gfs2/glock.c
@@ -707,18 +707,8 @@ 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;