[Cluster-devel] [GFS2] Remove HIF_PROMOTE flag

[Cluster-devel] [GFS2] Remove HIF_PROMOTE flag

[Steven Whitehouse]

Hi,

This and the following patch are the next two of my glock clean up patches,

Steve.

From 175876174e4652899c53c311850070b18a50ce36 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 30 Jul 2007 19:36:05 +0100
Subject: [PATCH] [GFS2] Remove HIF_PROMOTE flag

This flag isn't required any more, so remove it.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index be0368b..83cd60b 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -482,7 +482,6 @@ static int rq_promote(struct gfs2_glock *gl)
 	struct gfs2_holder *gh = list_entry(gl->gl_waiters3.next,
 					    struct gfs2_holder, gh_list);
 
-	BUG_ON(test_bit(HIF_PROMOTE, &gh->gh_iflags) == 0);
 	if (!relaxed_state_ok(gl->gl_state, gh->gh_state, gh->gh_flags)) {
 		if (list_empty(&gl->gl_holders)) {
 			gl->gl_req_gh = gh;
@@ -1050,8 +1049,6 @@ restart:
 		return -EIO;
 	}
 
-	set_bit(HIF_PROMOTE, &gh->gh_iflags);
-
 	spin_lock(&gl->gl_spin);
 	add_to_queue(gh);
 	run_queue(gl);
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 4a48ded..0eca96a 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -134,7 +134,6 @@ struct gfs2_glock_operations {
 enum {
 	/* Actions */
 	HIF_MUTEX		= 0,
-	HIF_PROMOTE		= 1,
 
 	/* States */
 	HIF_HOLDER		= 6,
@@ -179,7 +178,7 @@ struct gfs2_glock {
 	unsigned long gl_ip;
 	struct list_head gl_holders;
 	struct list_head gl_waiters1;	/* HIF_MUTEX */
-	struct list_head gl_waiters3;	/* HIF_PROMOTE */
+	struct list_head gl_waiters3;
 
 	const struct gfs2_glock_operations *gl_ops;
 
-- 
1.5.1.2