From: teigland@sourceware.org <teigland@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/gfs-kernel/src gfs/incore.h gfs/lm.c d ...
Date: 12 Sep 2006 18:21:21 -0000 [thread overview]
Message-ID: <20060912182121.7710.qmail@sourceware.org> (raw)
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;
reply other threads:[~2006-09-12 18:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060912182121.7710.qmail@sourceware.org \
--to=teigland@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).