Attachment 312369 Details for Bug 455940 – A second attempt at a test patch.

[patch] A second attempt at a test patch.

test2.diff (text/plain), 1.61 KB, created by Steve Whitehouse on 2008-07-22 17:04:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2008-07-22 17:04:47 UTC

Size: 1.61 KB

patch

obsolete

>diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
>index 13391e5..063b171 100644
>--- a/fs/gfs2/glock.c
>+++ b/fs/gfs2/glock.c
>@@ -594,10 +594,11 @@ 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))
>-			gfs2_demote_wake(gl);
>+		GLOCK_BUG_ON(gl, test_bit(GLF_DEMOTE, &gl->gl_flags));
> 		if (do_promote(gl) == 0)
> 			goto out;
>+		if (test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags))
>+			goto out;
> 		gh = find_first_waiter(gl);
> 		gl->gl_target = gh->gh_state;
> 		if (!(gh->gh_flags & (LM_FLAG_TRY | LM_FLAG_TRY_1CB)))
>@@ -822,10 +823,9 @@ static void wait_on_demote(struct gfs2_glock *gl)
> static void handle_callback(struct gfs2_glock *gl, unsigned int state,
> 			    int remote, unsigned long delay)
> {
>-	int bit = delay ? GLF_PENDING_DEMOTE : GLF_DEMOTE;
>-
>-	set_bit(bit, &gl->gl_flags);
> 	if (gl->gl_demote_state == LM_ST_EXCLUSIVE) {
>+		int bit = delay ? GLF_PENDING_DEMOTE : GLF_DEMOTE;
>+		set_bit(bit, &gl->gl_flags);
> 		gl->gl_demote_state = state;
> 		gl->gl_demote_time = jiffies;
> 		if (remote && gl->gl_ops->go_type == LM_TYPE_IOPEN &&
>@@ -833,6 +833,10 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state,
> 			gfs2_glock_schedule_for_reclaim(gl);
> 	} else if (gl->gl_demote_state != LM_ST_UNLOCKED &&
> 			gl->gl_demote_state != state) {
>+		GLOCK_BUG_ON(gl, !test_bit(GLF_DEMOTE, &gl->gl_flags) &&
>+			     !test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags));
>+		if (!delay)
>+			set_bit(GLF_DEMOTE, &gl->gl_flags);
> 		gl->gl_demote_state = LM_ST_UNLOCKED;
> 	}
> }

Actions: View | Diff

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