From 4ab7adaada07930cffd483fe00605417b0f2e0bc Mon Sep 17 00:00:00 2001
From: Wendy Cheng <wcheng@redhat.com>
Date: Thu, 13 Sep 2007 17:52:42 -0400
Subject: [PATCH] --- yaml --- r: 67685 b: refs/heads/master c:
 49e61f2ef6f7d1d0296e3e30d366b28e0ca595c2 h: refs/heads/master i:   67683:
 ecce5214f96bcb47346036a728ecb3c94e209317 v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/glock.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index eea79d75d6bb..63e8bff9448e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4c20166dcfca106f0f416bfce200099ed76ab18
+refs/heads/master: 49e61f2ef6f7d1d0296e3e30d366b28e0ca595c2
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index d631cad0aeee..a37efe4aae6f 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/fs/gfs2/glock.c
@@ -716,12 +716,8 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state,
 		gl->gl_demote_time = jiffies;
 		if (remote && gl->gl_ops->go_type == LM_TYPE_IOPEN &&
 		    gl->gl_object) {
-			struct inode *inode = igrab(gl->gl_object);
+			gfs2_glock_schedule_for_reclaim(gl);
 			spin_unlock(&gl->gl_spin);
-			if (inode) {
-				d_prune_aliases(inode);
-				iput(inode);
-			}
 			return;
 		}
 	} else if (gl->gl_demote_state != LM_ST_UNLOCKED &&