Attachment 312646 Details for Bug 455940 – Back to first principals

[patch] Back to first principals

test6.diff (text/plain), 1.39 KB, created by Steve Whitehouse on 2008-07-25 13:52:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2008-07-25 13:52:57 UTC

Size: 1.39 KB

patch

obsolete

>diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
>index 4cbb695..3970b9b 100644
>--- a/fs/gfs2/glock.c
>+++ b/fs/gfs2/glock.c
>@@ -464,8 +464,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;
>@@ -594,8 +596,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);
>@@ -1639,6 +1643,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;
> }
>diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
>index 448697a..d5cc064 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 {

Actions: View | Diff

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