---

yaml --- r: 133238 b: refs/heads/master c: ac2425e h: refs/heads/master v: v3
git-mirror · Mar 24, 2009 · c6c1ea3 · c6c1ea3
1 parent e4efa43
commit c6c1ea3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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
@@ -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;