From f83816d1a6d29ab627a2242679eda475f367f286 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 19 Jan 2007 13:57:36 -0500
Subject: [PATCH] --- yaml --- r: 46298 b: refs/heads/master c:
 6bd9c8c2fb99d1f5af6201db2f063c1d754c230a h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/gfs2/glock.c  | 2 --
 trunk/fs/gfs2/incore.h | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d2a00dbae8a5..fcdf2c8ec2ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5dab552c82ce416d7be867b1e5a0fa585dcf590
+refs/heads/master: 6bd9c8c2fb99d1f5af6201db2f063c1d754c230a
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index 90847e0957bb..8e4b55a2bd77 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/fs/gfs2/glock.c
@@ -1568,8 +1568,6 @@ static void blocking_cb(struct gfs2_sbd *sdp, struct lm_lockname *name,
 	if (!gl)
 		return;
 
-	if (gl->gl_ops->go_callback)
-		gl->gl_ops->go_callback(gl, state);
 	handle_callback(gl, state);
 
 	spin_lock(&gl->gl_spin);
diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h
index dc024b18ea96..1acbcc2415ee 100644
--- a/trunk/fs/gfs2/incore.h
+++ b/trunk/fs/gfs2/incore.h
@@ -110,7 +110,6 @@ struct gfs2_glock_operations {
 	int (*go_demote_ok) (struct gfs2_glock *gl);
 	int (*go_lock) (struct gfs2_holder *gh);
 	void (*go_unlock) (struct gfs2_holder *gh);
-	void (*go_callback) (struct gfs2_glock *gl, unsigned int state);
 	const int go_type;
 };