Attachment 213381 Details for Bug 221152 – The second of five patches

[patch] The second of five patches

gl-clean-2.diff (text/plain), 1.99 KB, created by Steve Whitehouse on 2007-10-02 13:37:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-10-02 13:37:35 UTC

Size: 1.99 KB

patch

obsolete

>From swhiteho@redhat.com Mon Jul 30 05:54:16 2007
>Return-Path: <swhiteho@redhat.com>
>Received: from pobox.fab.redhat.com ([unix socket]) by pobox.fab.redhat.com
>	(Cyrus v2.2.12-Invoca-RPM-2.2.12-8.1.RHEL4) with LMTPA; Mon, 30 Jul 2007
>	05:54:16 -0400
>X-Sieve: CMU Sieve 2.2
>Received: from localhost.localdomain (vpn-14-116.rdu.redhat.com
>	[10.11.14.116]) by pobox.fab.redhat.com (8.13.1/8.13.1) with ESMTP id
>	l6U9sCFq014089; Mon, 30 Jul 2007 05:54:15 -0400
>From: Steven Whitehouse <swhiteho@redhat.com>
>To: cluster-devel@redhat.com
>Cc: Steven Whitehouse <swhiteho@redhat.com>
>Subject: [PATCH] [GFS2] Clean up run_queue()
>Date: Mon, 30 Jul 2007 10:32:15 +0100
>Message-Id: <11857879472203-git-send-email-swhiteho@redhat.com>
>X-Mailer: git-send-email 1.5.1.2
>In-Reply-To: <1185787946183-git-send-email-swhiteho@redhat.com>
>References: <11857879381186-git-send-email-swhiteho@redhat.com>
>	 <1185787946183-git-send-email-swhiteho@redhat.com>
>X-Evolution-Source: imap://swhiteho@pobox.fab.redhat.com/
>Content-Transfer-Encoding: 8bit
>Mime-Version: 1.0
>
>A further clean up to make the logic a bit more obvious and
>remove a local variable which is no longer required.
>
>Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
>
>diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
>index 65d6eba..79d61ff 100644
>--- a/fs/gfs2/glock.c
>+++ b/fs/gfs2/glock.c
>@@ -564,24 +564,19 @@ static int rq_demote(struct gfs2_glock *gl)
>  */
> static void run_queue(struct gfs2_glock *gl)
> {
>-	int blocked;
>-
>-	for (;;) {
>-		blocked = 1;
>-		if (test_bit(GLF_LOCK, &gl->gl_flags))
>-			break;
>-
>+	while(test_bit(GLF_LOCK, &gl->gl_flags) == 0) {
> 		if (!list_empty(&gl->gl_waiters1)) {
> 			rq_mutex(gl);
> 			break;
>-		} else if (test_bit(GLF_DEMOTE, &gl->gl_flags)) {
>-			blocked = rq_demote(gl);
>+		}
>+		if (test_bit(GLF_DEMOTE, &gl->gl_flags)) {
>+			if (rq_demote(gl) == 0)
>+				continue;
> 		} else if (!list_empty(&gl->gl_waiters3)) {
>-			blocked = rq_promote(gl);
>+			if (rq_promote(gl) == 0)
>+				continue;
> 		}
>-
>-		if (blocked)
>-			break;
>+		break;
> 	}
> }
> 
>-- 
>1.5.1.2
>

Actions: View | Diff

Attachments on bug 221152: 213371 | 213381 | 213391 | 213401 | 213411 | 241931