Attachment 312657 Details for Bug 455940 – Updated test patch

[patch] Updated test patch

test7.diff (text/plain), 3.27 KB, created by Steve Whitehouse on 2008-07-25 15:55:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2008-07-25 15:55:24 UTC

Size: 3.27 KB

patch

obsolete

>diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
>index 4cbb695..c06f733 100644
>--- a/fs/gfs2/glock.c
>+++ b/fs/gfs2/glock.c
>@@ -390,6 +390,7 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
> 			gfs2_glock_put(gl);
> 	}
> 
>+	gl->gl_prev_state = gl->gl_state;
> 	gl->gl_state = new_state;
> 	gl->gl_tchange = jiffies;
> }
>@@ -464,8 +465,10 @@ retry:
> 	}
> 
> 	/* Fast path - we got what we asked for */
>-	if (test_and_clear_bit(GLF_DEMOTE_IN_PROGRESS, &gl->gl_flags))
>+	if (test_and_clear_bit(GLF_DEMOTE_IN_PROGRESS, &gl->gl_flags)) {
>+		clear_bit(GLF_TEST, &gl->gl_flags);
> 		gfs2_demote_wake(gl);
>+	}
> 	if (state != LM_ST_UNLOCKED) {
> 		if (glops->go_xmote_bh) {
> 			int rv;
>@@ -519,8 +522,8 @@ static void do_xmote(struct gfs2_glock *gl, struct gfs2_holder *gh, unsigned int
> 
> 	lck_flags &= (LM_FLAG_TRY | LM_FLAG_TRY_1CB | LM_FLAG_NOEXP |
> 		      LM_FLAG_PRIORITY);
>-	BUG_ON(gl->gl_state == target);
>-	BUG_ON(gl->gl_state == gl->gl_target);
>+	GLOCK_BUG_ON(gl, gl->gl_state == target);
>+	GLOCK_BUG_ON(gl, gl->gl_state == gl->gl_target);
> 	if ((target == LM_ST_UNLOCKED || target == LM_ST_DEFERRED) &&
> 	    glops->go_inval) {
> 		set_bit(GLF_INVALIDATE_IN_PROGRESS, &gl->gl_flags);
>@@ -594,8 +597,10 @@ static void run_queue(struct gfs2_glock *gl, const int nonblock)
> 		GLOCK_BUG_ON(gl, gl->gl_demote_state == LM_ST_EXCLUSIVE);
> 		gl->gl_target = gl->gl_demote_state;
> 	} else {
>-		if (test_bit(GLF_DEMOTE, &gl->gl_flags))
>+		if (test_bit(GLF_DEMOTE, &gl->gl_flags)) {
>+			set_bit(GLF_TEST, &gl->gl_flags);
> 			gfs2_demote_wake(gl);
>+		}
> 		if (do_promote(gl) == 0)
> 			goto out;
> 		gh = find_first_waiter(gl);
>@@ -689,6 +694,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
> 	gl->gl_name = name;
> 	atomic_set(&gl->gl_ref, 1);
> 	gl->gl_state = LM_ST_UNLOCKED;
>+	gl->gl_prev_state = LM_ST_UNLOCKED;
> 	gl->gl_target = LM_ST_UNLOCKED;
> 	gl->gl_demote_state = LM_ST_EXCLUSIVE;
> 	gl->gl_hash = hash;
>@@ -1639,6 +1645,8 @@ static const char *gflags2str(char *buf, const unsigned long *gflags)
> 		*p++ = 'i';
> 	if (test_bit(GLF_REPLY_PENDING, gflags))
> 		*p++ = 'r';
>+	if (test_bit(GLF_TEST, gflags))
>+		*p++ = 'T';
> 	*p = 0;
> 	return buf;
> }
>@@ -1671,10 +1679,12 @@ static int __dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
> 
> 	dtime = jiffies - gl->gl_demote_time;
> 	dtime *= 1000000/HZ; /* demote time in uSec */
>-	if (!test_bit(GLF_DEMOTE, &gl->gl_flags))
>-		dtime = 0;
>-	gfs2_print_dbg(seq, "G:  s:%s n:%u/%llu f:%s t:%s d:%s/%llu l:%d a:%d r:%d\n",
>+/*	if (!test_bit(GLF_DEMOTE, &gl->gl_flags))
>+		dtime = 0;*/
>+	gfs2_print_dbg(seq, "G:  s:%s p:%s/%llu n:%u/%llu f:%s t:%s d:%s/%llu l:%d a:%d r:%d\n",
> 		  state2str(gl->gl_state),
>+		  state2str(gl->gl_prev_state),
>+		  (jiffies - gl->gl_tchange) * 1000000/HZ,
> 		  gl->gl_name.ln_type,
> 		  (unsigned long long)gl->gl_name.ln_number,
> 		  gflags2str(gflags_buf, &gl->gl_flags),
>diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
>index 448697a..297f58b 100644
>--- a/fs/gfs2/incore.h
>+++ b/fs/gfs2/incore.h
>@@ -167,6 +167,7 @@ enum {
> 	GLF_LFLUSH			= 7,
> 	GLF_INVALIDATE_IN_PROGRESS	= 8,
> 	GLF_REPLY_PENDING		= 9,
>+	GLF_TEST			= 10,
> };
> 
> struct gfs2_glock {
>@@ -178,6 +179,7 @@ struct gfs2_glock {
> 	spinlock_t gl_spin;
> 
> 	unsigned int gl_state;
>+	unsigned int gl_prev_state;
> 	unsigned int gl_target;
> 	unsigned int gl_reply;
> 	unsigned int gl_hash;

Actions: View | Diff

Attachments on bug 455940: 312277 | 312369 | 312492 | 312577 | 312596 | 312646 | 312657