Attachment 312492 Details for Bug 455940 – A third attempt at a test patch

[patch] A third attempt at a test patch

test3.diff (text/plain), 2.71 KB, created by Steve Whitehouse on 2008-07-23 15:44:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2008-07-23 15:44:02 UTC

Size: 2.71 KB

patch

obsolete

>diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
>index 4cbb695..06671de 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)))
>@@ -622,14 +623,17 @@ static void glock_work_func(struct work_struct *work)
> 	if (test_and_clear_bit(GLF_REPLY_PENDING, &gl->gl_flags))
> 		finish_xmote(gl, gl->gl_reply);
> 	spin_lock(&gl->gl_spin);
>-	if (test_and_clear_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) &&
>-	    gl->gl_state != LM_ST_UNLOCKED &&
>-	    gl->gl_demote_state != LM_ST_EXCLUSIVE) {
>-		unsigned long holdtime, now = jiffies;
>-		holdtime = gl->gl_tchange + gl->gl_ops->go_min_hold_time;
>-		if (time_before(now, holdtime))
>-			delay = holdtime - now;
>-		set_bit(delay ? GLF_PENDING_DEMOTE : GLF_DEMOTE, &gl->gl_flags);
>+	if (test_and_clear_bit(GLF_PENDING_DEMOTE, &gl->gl_flags)) {
>+		if (gl->gl_state != LM_ST_UNLOCKED &&
>+		    gl->gl_demote_state != LM_ST_EXCLUSIVE) {
>+			unsigned long holdtime, now = jiffies;
>+			holdtime = gl->gl_tchange + gl->gl_ops->go_min_hold_time;
>+			if (time_before(now, holdtime))
>+				delay = holdtime - now;
>+			set_bit(delay ? GLF_PENDING_DEMOTE : GLF_DEMOTE, &gl->gl_flags);
>+		} else if (!test_bit(GLF_DEMOTE, &gl->gl_flags)) {
>+				gl->gl_demote_state = LM_ST_EXCLUSIVE;
>+		}
> 	}
> 	run_queue(gl, 0);
> 	spin_unlock(&gl->gl_spin);
>@@ -822,10 +826,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 +836,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