From c6c1ea3f8d058a4226dc566077b4a33bd7c41997 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 13 Jan 2009 09:53:43 +0000
Subject: [PATCH] --- yaml --- r: 133238 b: refs/heads/master c:
 ac2425e7d319dec0523e52ee120a158ce6668cbd 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 d7b7b02acfed..d03db63f5c70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f057f6cdf64175db1151b1f5d110e29904f119a1
+refs/heads/master: ac2425e7d319dec0523e52ee120a158ce6668cbd
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index cd200a564c79..173e59ce9ad3 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/fs/gfs2/glock.c
@@ -700,7 +700,6 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
 	snprintf(gl->gl_strname, GDLM_STRNAME_BYTES, "%8x%16llx", name.ln_type, (unsigned long long)number);
 	memset(&gl->gl_lksb, 0, sizeof(struct dlm_lksb));
 	gl->gl_lksb.sb_lvbptr = gl->gl_lvb;
-	gl->gl_stamp = jiffies;
 	gl->gl_tchange = jiffies;
 	gl->gl_object = NULL;
 	gl->gl_sbd = sdp;
@@ -1008,7 +1007,6 @@ void gfs2_glock_dq(struct gfs2_holder *gh)
 			spin_lock(&gl->gl_spin);
 			clear_bit(GLF_LOCK, &gl->gl_flags);
 		}
-		gl->gl_stamp = jiffies;
 		if (list_empty(&gl->gl_holders) &&
 		    !test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) &&
 		    !test_bit(GLF_DEMOTE, &gl->gl_flags))
diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h
index 0af7c24de6a1..8fe0675120ac 100644
--- a/trunk/fs/gfs2/incore.h
+++ b/trunk/fs/gfs2/incore.h
@@ -211,7 +211,6 @@ struct gfs2_glock {
 	char gl_strname[GDLM_STRNAME_BYTES];
 	struct dlm_lksb gl_lksb;
 	char gl_lvb[32];
-	unsigned long gl_stamp;
 	unsigned long gl_tchange;
 	void *gl_object;