[Cluster-devel] cluster/gfs-kernel/src gfs/incore.h gfs/lm.c d ...

[Cluster-devel] cluster/gfs-kernel/src gfs/incore.h gfs/lm.c d ...

[teigland]

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

Modified files:
	gfs-kernel/src/gfs: incore.h lm.c 
Removed files:
	gfs-kernel/src/dlm: Makefile Makefile.kernel lock.c lock_dlm.h 
	                    lock_dlm_plock.h main.c mount.c plock.c 
	                    sysfs.c thread.c 
	gfs-kernel/src/harness: Makefile Makefile.kernel lm_interface.h 
	                        main.c 
	gfs-kernel/src/nolock: Makefile Makefile.kernel main.c 

Log message:
	remove stuff from dlm/nolock/harness since it all comes from upstream
	now

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/Makefile.diff?cvsroot=cluster&r1=1.12&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/Makefile.kernel.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/lock.c.diff?cvsroot=cluster&r1=1.35&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/lock_dlm.h.diff?cvsroot=cluster&r1=1.41&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/lock_dlm_plock.h.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/main.c.diff?cvsroot=cluster&r1=1.15&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/mount.c.diff?cvsroot=cluster&r1=1.31&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/plock.c.diff?cvsroot=cluster&r1=1.21&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/sysfs.c.diff?cvsroot=cluster&r1=1.13&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/thread.c.diff?cvsroot=cluster&r1=1.30&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/incore.h.diff?cvsroot=cluster&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/lm.c.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/harness/Makefile.diff?cvsroot=cluster&r1=1.5&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/harness/Makefile.kernel.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/harness/lm_interface.h.diff?cvsroot=cluster&r1=1.13&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/harness/main.c.diff?cvsroot=cluster&r1=1.9&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/nolock/Makefile.diff?cvsroot=cluster&r1=1.6&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/nolock/Makefile.kernel.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/nolock/main.c.diff?cvsroot=cluster&r1=1.14&r2=NONE

--- cluster/gfs-kernel/src/gfs/incore.h	2006/08/02 17:21:19	1.26
+++ cluster/gfs-kernel/src/gfs/incore.h	2006/09/12 18:21:17	1.27
@@ -947,6 +947,8 @@
 #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/08/11 14:32:32	1.14
+++ cluster/gfs-kernel/src/gfs/lm.c	2006/09/12 18:21:17	1.15
@@ -159,6 +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);
 	return ret;