From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 12 Sep 2006 18:24:27 -0000
Subject: [Cluster-devel] cluster/gfs-kernel/src/gfs incore.h lm.c
Message-ID: <20060912182427.8333.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-09-12 18:24:27

Modified files:
	gfs-kernel/src/gfs: incore.h lm.c 

Log message:
	undo junk mistakenly added by last commit

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/incore.h.diff?cvsroot=cluster&r1=1.27&r2=1.28
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/lm.c.diff?cvsroot=cluster&r1=1.15&r2=1.16

--- cluster/gfs-kernel/src/gfs/incore.h	2006/09/12 18:21:17	1.27
+++ cluster/gfs-kernel/src/gfs/incore.h	2006/09/12 18:24:27	1.28
@@ -947,8 +947,6 @@
 #define SDF_FOUND_Q_DUMP        (12) /* Recovery found qutoa tags */
 #define SDF_IN_LOG_DUMP         (13) /* Serializes log dumps */
 
-#define SDF_UNMOUNTING		(14)
-
 /* Glock cache */
 #define GFS_GL_HASH_SHIFT       (13)    /* # hash buckets = 8K */
 #define GFS_GL_HASH_SIZE        (1 << GFS_GL_HASH_SHIFT)
--- cluster/gfs-kernel/src/gfs/lm.c	2006/09/12 18:21:17	1.15
+++ cluster/gfs-kernel/src/gfs/lm.c	2006/09/12 18:24:27	1.16
@@ -159,10 +159,8 @@
 	int ret;
 	if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
 		ret = 0;
-	else if (test_bit(SDF_UNMOUNTING, &sdp->sd_flags)) /* && LM_UNMOUNT_UNLOCK */
-		ret = 0;
 	else
-		ret =  sdp->sd_lockstruct.ls_ops->lm_unlock(lock, cur_state);
+		ret = sdp->sd_lockstruct.ls_ops->lm_unlock(lock, cur_state);
 	return ret;
 }