aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/glock.c2
-rw-r--r--fs/gfs2/incore.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index cd200a564c79..173e59ce9ad3 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -700,7 +700,6 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
700 snprintf(gl->gl_strname, GDLM_STRNAME_BYTES, "%8x%16llx", name.ln_type, (unsigned long long)number); 700 snprintf(gl->gl_strname, GDLM_STRNAME_BYTES, "%8x%16llx", name.ln_type, (unsigned long long)number);
701 memset(&gl->gl_lksb, 0, sizeof(struct dlm_lksb)); 701 memset(&gl->gl_lksb, 0, sizeof(struct dlm_lksb));
702 gl->gl_lksb.sb_lvbptr = gl->gl_lvb; 702 gl->gl_lksb.sb_lvbptr = gl->gl_lvb;
703 gl->gl_stamp = jiffies;
704 gl->gl_tchange = jiffies; 703 gl->gl_tchange = jiffies;
705 gl->gl_object = NULL; 704 gl->gl_object = NULL;
706 gl->gl_sbd = sdp; 705 gl->gl_sbd = sdp;
@@ -1008,7 +1007,6 @@ void gfs2_glock_dq(struct gfs2_holder *gh)
1008 spin_lock(&gl->gl_spin); 1007 spin_lock(&gl->gl_spin);
1009 clear_bit(GLF_LOCK, &gl->gl_flags); 1008 clear_bit(GLF_LOCK, &gl->gl_flags);
1010 } 1009 }
1011 gl->gl_stamp = jiffies;
1012 if (list_empty(&gl->gl_holders) && 1010 if (list_empty(&gl->gl_holders) &&
1013 !test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) && 1011 !test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) &&
1014 !test_bit(GLF_DEMOTE, &gl->gl_flags)) 1012 !test_bit(GLF_DEMOTE, &gl->gl_flags))
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 0af7c24de6a1..8fe0675120ac 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -211,7 +211,6 @@ struct gfs2_glock {
211 char gl_strname[GDLM_STRNAME_BYTES]; 211 char gl_strname[GDLM_STRNAME_BYTES];
212 struct dlm_lksb gl_lksb; 212 struct dlm_lksb gl_lksb;
213 char gl_lvb[32]; 213 char gl_lvb[32];
214 unsigned long gl_stamp;
215 unsigned long gl_tchange; 214 unsigned long gl_tchange;
216 void *gl_object; 215 void *gl_object;
217 216