[SCM] Samba Shared Repository - branch master updated -
e36d64728f79087610737fa54eee69af3ab99c5b
Stefan Metzmacher
metze at samba.org
Mon Dec 29 13:49:20 GMT 2008
The branch, master has been updated
via e36d64728f79087610737fa54eee69af3ab99c5b (commit)
via aec16efaf29bc6c5e4973e2f4e218d7fc4b652cb (commit)
via a7036d2bd0d6b476c886072518961fbbc10a5861 (commit)
from 86cb14db2b041f6f78b7d5b6afe10d141c0b773d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e36d64728f79087610737fa54eee69af3ab99c5b
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 29 11:02:32 2008 +0100
s4:cluster: remove old/broken ctdb code
We don't need a full copy of ctdb...
If we want to readd cluster support,
we should just use a ctdb client library.
metze
commit aec16efaf29bc6c5e4973e2f4e218d7fc4b652cb
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 29 11:24:05 2008 +0100
s4: remove unused dbwrap code
If we readd this later, we should share the code with
samba3 and make it async/non-blocking.
metze
commit a7036d2bd0d6b476c886072518961fbbc10a5861
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 29 11:52:53 2008 +0100
s4: Revert "r24284: change brlock_tdb.c to use the dbwrap API. This actually makes the"
This reverts commit 4792285282e2ec78ccb0ebc3cac6465d1d26ef10.
Conflicts:
source4/ntvfs/common/brlock_tdb.c
source4/ntvfs/common/config.mk
-----------------------------------------------------------------------
Summary of changes:
source3/samba4.mk | 2 -
source4/Makefile | 1 -
source4/cluster/config.mk | 4 -
source4/cluster/ctdb/Makefile.in | 158 --
source4/cluster/ctdb/aclocal.m4 | 1 -
source4/cluster/ctdb/autogen.sh | 17 -
source4/cluster/ctdb/brlock_ctdb.c | 945 ---------
source4/cluster/ctdb/client/ctdb_client.c | 2225 --------------------
source4/cluster/ctdb/common/cmdline.c | 132 --
source4/cluster/ctdb/common/ctdb_io.c | 338 ---
source4/cluster/ctdb/common/ctdb_ltdb.c | 177 --
source4/cluster/ctdb/common/ctdb_message.c | 111 -
source4/cluster/ctdb/common/ctdb_util.c | 284 ---
source4/cluster/ctdb/common/system.c | 385 ----
source4/cluster/ctdb/config.guess | 1464 -------------
source4/cluster/ctdb/config.h.in | 756 -------
source4/cluster/ctdb/config.mk | 24 -
source4/cluster/ctdb/config.sub | 1577 --------------
source4/cluster/ctdb/configure.ac | 68 -
source4/cluster/ctdb/ctdb_cluster.c | 250 ---
source4/cluster/ctdb/ctdb_cluster.h | 23 -
source4/cluster/ctdb/doc/ctdb.1 | 403 ----
source4/cluster/ctdb/doc/ctdb.1.html | 277 ---
source4/cluster/ctdb/doc/ctdb.1.xml | 553 -----
source4/cluster/ctdb/doc/ctdbd.1 | 213 --
source4/cluster/ctdb/doc/ctdbd.1.html | 182 --
source4/cluster/ctdb/doc/ctdbd.1.xml | 379 ----
source4/cluster/ctdb/doc/onnode.1 | 79 -
source4/cluster/ctdb/doc/onnode.1.html | 45 -
source4/cluster/ctdb/doc/onnode.1.xml | 91 -
source4/cluster/ctdb/example/cluster_start.sh | 12 -
source4/cluster/ctdb/example/howto.txt | 19 -
source4/cluster/ctdb/example/nlist.txt | 2 -
source4/cluster/ctdb/example/smb.conf.cluster | 26 -
source4/cluster/ctdb/example/smb.conf.node1 | 6 -
source4/cluster/ctdb/example/smb.conf.node2 | 6 -
source4/cluster/ctdb/example/unclist.txt | 2 -
source4/cluster/ctdb/ib/README.txt | 19 -
source4/cluster/ctdb/ib/config.m4 | 31 -
source4/cluster/ctdb/ib/ibw_ctdb.c | 174 --
source4/cluster/ctdb/ib/ibw_ctdb.h | 50 -
source4/cluster/ctdb/ib/ibw_ctdb_init.c | 237 ---
source4/cluster/ctdb/ib/ibwrapper.c | 1361 ------------
source4/cluster/ctdb/ib/ibwrapper.h | 218 --
source4/cluster/ctdb/ib/ibwrapper_internal.h | 126 --
source4/cluster/ctdb/ib/ibwrapper_test.c | 659 ------
source4/cluster/ctdb/include/cmdline.h | 7 -
source4/cluster/ctdb/include/ctdb.h | 375 ----
source4/cluster/ctdb/include/ctdb_private.h | 1107 ----------
source4/cluster/ctdb/include/idtree.h | 7 -
source4/cluster/ctdb/include/includes.h | 40 -
source4/cluster/ctdb/install-sh | 238 ---
source4/cluster/ctdb/opendb_ctdb.c | 597 ------
source4/cluster/ctdb/packaging/RHEL/ctdb.spec | 117 -
source4/cluster/ctdb/packaging/RHEL/makerpms.sh | 90 -
.../cluster/ctdb/packaging/RHEL/setup/ctdb.init | 104 -
.../ctdb/packaging/RHEL/setup/ctdb.sysconfig | 52 -
source4/cluster/ctdb/packaging/RPM/ctdb.spec | 113 -
source4/cluster/ctdb/packaging/RPM/makerpms.sh | 89 -
source4/cluster/ctdb/server/ctdb_call.c | 737 -------
source4/cluster/ctdb/server/ctdb_control.c | 498 -----
source4/cluster/ctdb/server/ctdb_daemon.c | 926 --------
source4/cluster/ctdb/server/ctdb_freeze.c | 255 ---
source4/cluster/ctdb/server/ctdb_lockwait.c | 164 --
source4/cluster/ctdb/server/ctdb_ltdb_server.c | 366 ----
source4/cluster/ctdb/server/ctdb_monitor.c | 227 --
source4/cluster/ctdb/server/ctdb_recover.c | 679 ------
source4/cluster/ctdb/server/ctdb_recoverd.c | 1511 -------------
source4/cluster/ctdb/server/ctdb_server.c | 469 ----
source4/cluster/ctdb/server/ctdb_takeover.c | 822 --------
source4/cluster/ctdb/server/ctdb_traverse.c | 462 ----
source4/cluster/ctdb/server/ctdb_tunables.c | 163 --
source4/cluster/ctdb/server/ctdbd.c | 229 --
source4/cluster/ctdb/server/eventscript.c | 191 --
source4/cluster/ctdb/takeover/ctdb_takeover.c | 583 -----
source4/cluster/ctdb/takeover/system.c | 381 ----
source4/cluster/ctdb/tcp/ctdb_tcp.h | 54 -
source4/cluster/ctdb/tcp/tcp_connect.c | 370 ----
source4/cluster/ctdb/tcp/tcp_init.c | 140 --
source4/cluster/ctdb/tcp/tcp_io.c | 89 -
source4/cluster/ctdb/tests/bench.sh | 24 -
source4/cluster/ctdb/tests/ctdb_bench.c | 229 --
source4/cluster/ctdb/tests/ctdb_fetch.c | 262 ---
source4/cluster/ctdb/tests/ctdb_store.c | 156 --
source4/cluster/ctdb/tests/ctdbd.sh | 50 -
source4/cluster/ctdb/tests/events | 68 -
source4/cluster/ctdb/tests/fetch.sh | 24 -
source4/cluster/ctdb/tests/nodes.txt | 4 -
source4/cluster/ctdb/tests/public_addresses | 4 -
source4/cluster/ctdb/tests/recover.sh | 107 -
source4/cluster/ctdb/tests/run_tests.sh | 8 -
source4/cluster/ctdb/tests/start_daemons.sh | 28 -
source4/cluster/ctdb/tools/ctdb.c | 1024 ---------
source4/cluster/ctdb/tools/onnode.rsh | 43 -
source4/cluster/ctdb/tools/onnode.ssh | 43 -
source4/lib/dbwrap/config.mk | 6 -
source4/lib/dbwrap/dbwrap.c | 39 -
source4/lib/dbwrap/dbwrap.h | 54 -
source4/lib/dbwrap/dbwrap_ctdb.c | 192 --
source4/lib/dbwrap/dbwrap_tdb.c | 267 ---
source4/main.mk | 1 -
source4/ntvfs/common/brlock_tdb.c | 171 +-
source4/ntvfs/common/config.mk | 3 +-
source4/ntvfs/common/opendb.c | 6 +-
source4/smbd/server.c | 4 -
105 files changed, 102 insertions(+), 29079 deletions(-)
delete mode 100644 source4/cluster/ctdb/Makefile.in
delete mode 100644 source4/cluster/ctdb/aclocal.m4
delete mode 100755 source4/cluster/ctdb/autogen.sh
delete mode 100644 source4/cluster/ctdb/brlock_ctdb.c
delete mode 100644 source4/cluster/ctdb/client/ctdb_client.c
delete mode 100644 source4/cluster/ctdb/common/cmdline.c
delete mode 100644 source4/cluster/ctdb/common/ctdb_io.c
delete mode 100644 source4/cluster/ctdb/common/ctdb_ltdb.c
delete mode 100644 source4/cluster/ctdb/common/ctdb_message.c
delete mode 100644 source4/cluster/ctdb/common/ctdb_util.c
delete mode 100644 source4/cluster/ctdb/common/system.c
delete mode 100755 source4/cluster/ctdb/config.guess
delete mode 100644 source4/cluster/ctdb/config.h.in
delete mode 100644 source4/cluster/ctdb/config.mk
delete mode 100755 source4/cluster/ctdb/config.sub
delete mode 100644 source4/cluster/ctdb/configure.ac
delete mode 100644 source4/cluster/ctdb/ctdb_cluster.c
delete mode 100644 source4/cluster/ctdb/ctdb_cluster.h
delete mode 100644 source4/cluster/ctdb/doc/ctdb.1
delete mode 100644 source4/cluster/ctdb/doc/ctdb.1.html
delete mode 100644 source4/cluster/ctdb/doc/ctdb.1.xml
delete mode 100644 source4/cluster/ctdb/doc/ctdbd.1
delete mode 100644 source4/cluster/ctdb/doc/ctdbd.1.html
delete mode 100644 source4/cluster/ctdb/doc/ctdbd.1.xml
delete mode 100644 source4/cluster/ctdb/doc/onnode.1
delete mode 100644 source4/cluster/ctdb/doc/onnode.1.html
delete mode 100644 source4/cluster/ctdb/doc/onnode.1.xml
delete mode 100755 source4/cluster/ctdb/example/cluster_start.sh
delete mode 100644 source4/cluster/ctdb/example/howto.txt
delete mode 100644 source4/cluster/ctdb/example/nlist.txt
delete mode 100644 source4/cluster/ctdb/example/smb.conf.cluster
delete mode 100644 source4/cluster/ctdb/example/smb.conf.node1
delete mode 100644 source4/cluster/ctdb/example/smb.conf.node2
delete mode 100644 source4/cluster/ctdb/example/unclist.txt
delete mode 100644 source4/cluster/ctdb/ib/README.txt
delete mode 100644 source4/cluster/ctdb/ib/config.m4
delete mode 100644 source4/cluster/ctdb/ib/ibw_ctdb.c
delete mode 100644 source4/cluster/ctdb/ib/ibw_ctdb.h
delete mode 100644 source4/cluster/ctdb/ib/ibw_ctdb_init.c
delete mode 100644 source4/cluster/ctdb/ib/ibwrapper.c
delete mode 100644 source4/cluster/ctdb/ib/ibwrapper.h
delete mode 100644 source4/cluster/ctdb/ib/ibwrapper_internal.h
delete mode 100644 source4/cluster/ctdb/ib/ibwrapper_test.c
delete mode 100644 source4/cluster/ctdb/include/cmdline.h
delete mode 100644 source4/cluster/ctdb/include/ctdb.h
delete mode 100644 source4/cluster/ctdb/include/ctdb_private.h
delete mode 100644 source4/cluster/ctdb/include/idtree.h
delete mode 100644 source4/cluster/ctdb/include/includes.h
delete mode 100755 source4/cluster/ctdb/install-sh
delete mode 100644 source4/cluster/ctdb/opendb_ctdb.c
delete mode 100644 source4/cluster/ctdb/packaging/RHEL/ctdb.spec
delete mode 100755 source4/cluster/ctdb/packaging/RHEL/makerpms.sh
delete mode 100755 source4/cluster/ctdb/packaging/RHEL/setup/ctdb.init
delete mode 100644 source4/cluster/ctdb/packaging/RHEL/setup/ctdb.sysconfig
delete mode 100644 source4/cluster/ctdb/packaging/RPM/ctdb.spec
delete mode 100755 source4/cluster/ctdb/packaging/RPM/makerpms.sh
delete mode 100644 source4/cluster/ctdb/server/ctdb_call.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_control.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_daemon.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_freeze.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_lockwait.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_ltdb_server.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_monitor.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_recover.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_recoverd.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_server.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_takeover.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_traverse.c
delete mode 100644 source4/cluster/ctdb/server/ctdb_tunables.c
delete mode 100644 source4/cluster/ctdb/server/ctdbd.c
delete mode 100644 source4/cluster/ctdb/server/eventscript.c
delete mode 100644 source4/cluster/ctdb/takeover/ctdb_takeover.c
delete mode 100644 source4/cluster/ctdb/takeover/system.c
delete mode 100644 source4/cluster/ctdb/tcp/ctdb_tcp.h
delete mode 100644 source4/cluster/ctdb/tcp/tcp_connect.c
delete mode 100644 source4/cluster/ctdb/tcp/tcp_init.c
delete mode 100644 source4/cluster/ctdb/tcp/tcp_io.c
delete mode 100755 source4/cluster/ctdb/tests/bench.sh
delete mode 100644 source4/cluster/ctdb/tests/ctdb_bench.c
delete mode 100644 source4/cluster/ctdb/tests/ctdb_fetch.c
delete mode 100644 source4/cluster/ctdb/tests/ctdb_store.c
delete mode 100755 source4/cluster/ctdb/tests/ctdbd.sh
delete mode 100755 source4/cluster/ctdb/tests/events
delete mode 100755 source4/cluster/ctdb/tests/fetch.sh
delete mode 100644 source4/cluster/ctdb/tests/nodes.txt
delete mode 100644 source4/cluster/ctdb/tests/public_addresses
delete mode 100755 source4/cluster/ctdb/tests/recover.sh
delete mode 100755 source4/cluster/ctdb/tests/run_tests.sh
delete mode 100755 source4/cluster/ctdb/tests/start_daemons.sh
delete mode 100644 source4/cluster/ctdb/tools/ctdb.c
delete mode 100644 source4/cluster/ctdb/tools/onnode.rsh
delete mode 100755 source4/cluster/ctdb/tools/onnode.ssh
delete mode 100644 source4/lib/dbwrap/config.mk
delete mode 100644 source4/lib/dbwrap/dbwrap.c
delete mode 100644 source4/lib/dbwrap/dbwrap.h
delete mode 100644 source4/lib/dbwrap/dbwrap_ctdb.c
delete mode 100644 source4/lib/dbwrap/dbwrap_tdb.c
Changeset truncated at 500 lines:
diff --git a/source3/samba4.mk b/source3/samba4.mk
index a374e81..9848cce 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -70,7 +70,6 @@ dynconfigsrcdir := $(samba4srcdir)/dynconfig
heimdalsrcdir := $(samba4srcdir)/heimdal
dsdbsrcdir := $(samba4srcdir)/dsdb
smbdsrcdir := $(samba4srcdir)/smbd
-clustersrcdir := $(samba4srcdir)/cluster
libnetsrcdir := $(samba4srcdir)/libnet
authsrcdir := $(samba4srcdir)/auth
nsswitchsrcdir := $(samba4srcdir)/../nsswitch
@@ -90,7 +89,6 @@ nsswrappersrcdir := $(samba4srcdir)/../lib/nss_wrapper
libstreamsrcdir := $(samba4srcdir)/lib/stream
libutilsrcdir := $(samba4srcdir)/../lib/util
libtdrsrcdir := $(samba4srcdir)/lib/tdr
-libdbwrapsrcdir := $(samba4srcdir)/lib/dbwrap
libcryptosrcdir := $(samba4srcdir)/../lib/crypto
libtorturesrcdir := ../lib/torture
libcompressionsrcdir := $(samba4srcdir)/../lib/compression
diff --git a/source4/Makefile b/source4/Makefile
index fff2dbf..7d4540a 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -78,7 +78,6 @@ appwebsrcdir := lib/appweb
libstreamsrcdir := lib/stream
libutilsrcdir := ../lib/util
libtdrsrcdir := lib/tdr
-libdbwrapsrcdir := lib/dbwrap
libcryptosrcdir := ../lib/crypto
libtorturesrcdir := ../lib/torture
smb_serversrcdir := smb_server
diff --git a/source4/cluster/config.mk b/source4/cluster/config.mk
index e841956..3dae749 100644
--- a/source4/cluster/config.mk
+++ b/source4/cluster/config.mk
@@ -1,7 +1,3 @@
-ctdbsrcdir = $(clustersrcdir)/ctdb
-mkinclude ctdb/config.mk
-
[SUBSYSTEM::CLUSTER]
-PRIVATE_DEPENDENCIES = ctdb
CLUSTER_OBJ_FILES = $(addprefix $(clustersrcdir)/, cluster.o local.o)
diff --git a/source4/cluster/ctdb/Makefile.in b/source4/cluster/ctdb/Makefile.in
deleted file mode 100644
index 2891a22..0000000
--- a/source4/cluster/ctdb/Makefile.in
+++ /dev/null
@@ -1,158 +0,0 @@
-#!gmake
-#
-CC = @CC@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datarootdir = @datarootdir@
-includedir = @includedir@
-libdir = @libdir@
-bindir = @bindir@
-sbindir = @sbindir@
-mandir = @mandir@
-localstatedir = @localstatedir@
-VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
-srcdir = @srcdir@
-etcdir = @sysconfdir@
-builddir = @builddir@
-DESTDIR = /
-EXTRA_OBJ=@EXTRA_OBJ@
-XSLTPROC = /usr/bin/xsltproc
-INSTALLCMD = @INSTALL@
-
-POPT_LIBS = @POPT_LIBS@
-POPT_CFLAGS = @POPT_CFLAGS@
-POPT_OBJ = @POPT_OBJ@
-
-CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
- -I at tallocdir@ -I at tdbdir@/include -I at libreplacedir@ \
- -DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
- -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
-
-LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@
-
-UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util.o \
- lib/util/util_time.o lib/util/util_file.o
-
-CTDB_COMMON_OBJ = common/ctdb_io.o common/ctdb_util.o \
- common/ctdb_ltdb.o common/ctdb_message.o common/cmdline.o \
- lib/util/debug.o common/system.o
-
-CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
-
-CTDB_CLIENT_OBJ = client/ctdb_client.o \
- $(CTDB_COMMON_OBJ) $(POPT_OBJ) $(UTIL_OBJ) @TALLOC_OBJ@ @TDB_OBJ@ \
- @LIBREPLACEOBJ@ $(EXTRA_OBJ) @EVENTS_OBJ@
-
-CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o \
- server/ctdb_recoverd.o server/ctdb_recover.o server/ctdb_freeze.o \
- server/ctdb_tunables.o server/ctdb_monitor.o server/ctdb_server.o \
- server/ctdb_control.o server/ctdb_call.o server/ctdb_ltdb_server.o \
- server/ctdb_traverse.o server/eventscript.o server/ctdb_takeover.o \
- $(CTDB_CLIENT_OBJ) $(CTDB_TCP_OBJ) @INFINIBAND_WRAPPER_OBJ@
-
-TEST_BINS=bin/ctdb_bench bin/ctdb_fetch bin/ctdb_store @INFINIBAND_BINS@
-BINS = bin/ctdb bin/scsi_io
-SBINS = bin/ctdbd
-
-DIRS = lib bin
-
-.SUFFIXES: .c .o .h .1 .1.xml .1.html
-
-all: showflags dirs doc $(CTDB_SERVER_OBJ) $(CTDB_CLIENT_OBJ) $(BINS) $(SBINS) $(TEST_BINS)
-
-showflags:
- @echo 'ctdb will be compiled with flags:'
- @echo ' CFLAGS = $(CFLAGS)'
- @echo ' LIBS = $(LIBS)'
-
-.c.o:
- @echo Compiling $*.c
- @mkdir -p `dirname $@`
- @$(CC) $(CFLAGS) -c $< -o $@
-
-dirs:
- @mkdir -p $(DIRS)
-
-bin/ctdbd: $(CTDB_SERVER_OBJ)
- @echo Linking $@
- @$(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
-
-bin/scsi_io: $(CTDB_CLIENT_OBJ) scsi/scsi_io.o
- @echo Linking $@
- @$(CC) $(CFLAGS) -o $@ scsi/scsi_io.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
-bin/ctdb: $(CTDB_CLIENT_OBJ) tools/ctdb.o
- @echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tools/ctdb.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
-bin/ctdb_bench: $(CTDB_CLIENT_OBJ) tests/ctdb_bench.o
- @echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/ctdb_bench.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
-bin/ctdb_fetch: $(CTDB_CLIENT_OBJ) tests/ctdb_fetch.o
- @echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/ctdb_fetch.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
-bin/ctdb_store: $(CTDB_CLIENT_OBJ) tests/ctdb_store.o
- @echo Linking $@
- @$(CC) $(CFLAGS) -o $@ tests/ctdb_store.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
-bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o
- @echo Linking $@
- @$(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-
-.1.xml.1:
- -test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-.1.xml.1.html:
- -test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
-
-doc: doc/ctdb.1 doc/ctdb.1.html \
- doc/ctdbd.1 doc/ctdbd.1.html \
- doc/onnode.1 doc/onnode.1.html
-
-clean:
- rm -f *.o */*.o */*/*.o */*~
- rm -f $(BINS) $(SBINS) $(TEST_BINS)
-
-distclean: clean
- rm -f *~ */*~
- rm -rf bin
- rm -f config.log config.status config.cache config.h
- rm -f Makefile
-
-install: all
- mkdir -p $(DESTDIR)$(bindir)
- mkdir -p $(DESTDIR)$(sbindir)
- mkdir -p $(DESTDIR)$(includedir)
- mkdir -p $(DESTDIR)$(etcdir)/ctdb
- mkdir -p $(DESTDIR)$(etcdir)/ctdb/events.d
- ${INSTALLCMD} -m 755 bin/ctdb $(DESTDIR)$(bindir)
- ${INSTALLCMD} -m 755 bin/ctdbd $(DESTDIR)$(sbindir)
- ${INSTALLCMD} -m 644 include/ctdb.h $(DESTDIR)$(includedir)
- ${INSTALLCMD} -m 644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3
- ${INSTALLCMD} -m 755 config/events $(DESTDIR)$(etcdir)/ctdb
- ${INSTALLCMD} -m 755 config/functions $(DESTDIR)$(etcdir)/ctdb
- ${INSTALLCMD} -m 755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb
- ${INSTALLCMD} -m 755 config/events.d/10.interface $(DESTDIR)$(etcdir)/ctdb/events.d
- ${INSTALLCMD} -m 755 config/events.d/40.vsftpd $(DESTDIR)$(etcdir)/ctdb/events.d
- ${INSTALLCMD} -m 755 config/events.d/50.samba $(DESTDIR)$(etcdir)/ctdb/events.d
- ${INSTALLCMD} -m 755 config/events.d/60.nfs $(DESTDIR)$(etcdir)/ctdb/events.d
- ${INSTALLCMD} -m 755 config/events.d/61.nfstickle $(DESTDIR)$(etcdir)/ctdb/events.d
- ${INSTALLCMD} -m 755 tools/onnode.ssh $(DESTDIR)$(bindir)
- ${INSTALLCMD} -m 755 tools/onnode.rsh $(DESTDIR)$(bindir)
- if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi
- if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -m 644 doc/ctdb.1 $(DESTDIR)$(mandir)/man1; fi
- if [ -f doc/ctdbd.1 ];then ${INSTALLCMD} -m 644 doc/ctdbd.1 $(DESTDIR)$(mandir)/man1; fi
- if [ -f doc/onnode.1 ];then ${INSTALLCMD} -m 644 doc/onnode.1 $(DESTDIR)$(mandir)/man1; fi
- cd $(DESTDIR)$(bindir) && ln -sf onnode.ssh onnode
-
-test: all
- tests/run_tests.sh
-
-valgrindtest: all
- VALGRIND="valgrind -q --trace-children=yes" tests/run_tests.sh
-
-
-realdistclean: distclean
- rm -f configure config.h.in
diff --git a/source4/cluster/ctdb/aclocal.m4 b/source4/cluster/ctdb/aclocal.m4
deleted file mode 100644
index 5605e47..0000000
--- a/source4/cluster/ctdb/aclocal.m4
+++ /dev/null
@@ -1 +0,0 @@
-m4_include(libreplace.m4)
diff --git a/source4/cluster/ctdb/autogen.sh b/source4/cluster/ctdb/autogen.sh
deleted file mode 100755
index 500cab8..0000000
--- a/source4/cluster/ctdb/autogen.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-rm -rf autom4te.cache
-rm -f configure config.h.in
-
-IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
-IPATHS="$IPATHS -I lib/talloc -I talloc -I ../talloc"
-IPATHS="$IPATHS -I lib/tdb -I tdb -I ../tdb"
-IPATHS="$IPATHS -I lib/popt -I popt -I ../popt"
-autoheader $IPATHS || exit 1
-autoconf $IPATHS || exit 1
-
-rm -rf autom4te.cache
-
-echo "Now run ./configure and then make."
-exit 0
-
diff --git a/source4/cluster/ctdb/brlock_ctdb.c b/source4/cluster/ctdb/brlock_ctdb.c
deleted file mode 100644
index 1cc6beb..0000000
--- a/source4/cluster/ctdb/brlock_ctdb.c
+++ /dev/null
@@ -1,945 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- generic byte range locking code - ctdb backend
-
- Copyright (C) Andrew Tridgell 2006
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "system/filesys.h"
-#include "../tdb/include/tdb.h"
-#include "messaging/messaging.h"
-#include "lib/messaging/irpc.h"
-#include "libcli/libcli.h"
-#include "cluster/cluster.h"
-#include "ntvfs/ntvfs.h"
-#include "ntvfs/common/brlock.h"
-#include "include/ctdb.h"
-
-enum my_functions {FUNC_BRL_LOCK=1, FUNC_BRL_UNLOCK=2,
- FUNC_BRL_REMOVE_PENDING=3, FUNC_BRL_LOCKTEST=4,
- FUNC_BRL_CLOSE=5};
-
-/*
- in this module a "DATA_BLOB *file_key" is a blob that uniquely identifies
- a file. For a local posix filesystem this will usually be a combination
- of the device and inode numbers of the file, but it can be anything
- that uniquely idetifies a file for locking purposes, as long
- as it is applied consistently.
-*/
-
-/* this struct is typically attached to tcon */
-struct brl_context {
- struct ctdb_context *ctdb;
- struct ctdb_db_context *ctdb_db;
- struct server_id server;
- struct messaging_context *messaging_ctx;
-};
-
-/*
- the lock context contains the elements that define whether one
- lock is the same as another lock
-*/
-struct lock_context {
- struct server_id server;
- uint16_t smbpid;
- struct brl_context *ctx;
-};
-
-/* The data in brlock records is an unsorted linear array of these
- records. It is unnecessary to store the count as tdb provides the
- size of the record */
-struct lock_struct {
- struct lock_context context;
- struct ntvfs_handle *ntvfs;
- uint64_t start;
- uint64_t size;
- enum brl_type lock_type;
- void *notify_ptr;
-};
-
-/* this struct is attached to on open file handle */
-struct brl_handle {
- DATA_BLOB key;
- struct ntvfs_handle *ntvfs;
- struct lock_struct last_lock;
-};
-
-#if 0
-static void show_locks(const char *op, struct lock_struct *locks, int count)
-{
- int i;
- DEBUG(0,("OP: %s\n", op));
- if (locks == NULL) return;
- for (i=0;i<count;i++) {
- DEBUG(0,("%2d: %4d %4d %d.%d.%d %p %p\n",
- i, (int)locks[i].start, (int)locks[i].size,
- locks[i].context.server.node,
- locks[i].context.server.id,
- locks[i].context.smbpid,
- locks[i].context.ctx,
- locks[i].ntvfs));
- }
-}
-#endif
-
-/*
- Open up the brlock.tdb database. Close it down using
- talloc_free(). We need the messaging_ctx to allow for
- pending lock notifications.
-*/
-static struct brl_context *brl_ctdb_init(TALLOC_CTX *mem_ctx, struct server_id server, struct loadparm_context *lp_ctx,
- struct messaging_context *messaging_ctx)
-{
- struct ctdb_context *ctdb = talloc_get_type(cluster_backend_handle(),
- struct ctdb_context);
- struct brl_context *brl;
-
- brl = talloc(mem_ctx, struct brl_context);
- if (brl == NULL) {
- return NULL;
- }
-
- brl->ctdb = ctdb;
- brl->ctdb_db = ctdb_db_handle(ctdb, "brlock");
- if (brl->ctdb_db == NULL) {
- DEBUG(0,("Failed to get attached ctdb db handle for brlock\n"));
- talloc_free(brl);
- return NULL;
- }
- brl->server = server;
- brl->messaging_ctx = messaging_ctx;
-
- return brl;
-}
-
-static struct brl_handle *brl_ctdb_create_handle(TALLOC_CTX *mem_ctx, struct ntvfs_handle *ntvfs,
- DATA_BLOB *file_key)
-{
- struct brl_handle *brlh;
-
- brlh = talloc(mem_ctx, struct brl_handle);
- if (brlh == NULL) {
- return NULL;
- }
-
- brlh->key = *file_key;
- brlh->ntvfs = ntvfs;
- ZERO_STRUCT(brlh->last_lock);
-
- return brlh;
-}
-
-/*
- see if two locking contexts are equal
-*/
-static bool brl_ctdb_same_context(struct lock_context *ctx1, struct lock_context *ctx2)
-{
- return (cluster_id_equal(&ctx1->server, &ctx2->server) &&
- ctx1->smbpid == ctx2->smbpid &&
- ctx1->ctx == ctx2->ctx);
-}
-
-/*
- see if lck1 and lck2 overlap
-*/
-static bool brl_ctdb_overlap(struct lock_struct *lck1,
- struct lock_struct *lck2)
-{
- /* this extra check is not redundent - it copes with locks
- that go beyond the end of 64 bit file space */
- if (lck1->size != 0 &&
- lck1->start == lck2->start &&
- lck1->size == lck2->size) {
- return true;
- }
-
- if (lck1->start >= (lck2->start+lck2->size) ||
- lck2->start >= (lck1->start+lck1->size)) {
- return false;
- }
- return true;
-}
-
-/*
- See if lock2 can be added when lock1 is in place.
-*/
-static bool brl_ctdb_conflict(struct lock_struct *lck1,
- struct lock_struct *lck2)
-{
- /* pending locks don't conflict with anything */
- if (lck1->lock_type >= PENDING_READ_LOCK ||
- lck2->lock_type >= PENDING_READ_LOCK) {
- return false;
- }
-
- if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) {
- return false;
- }
-
- if (brl_ctdb_same_context(&lck1->context, &lck2->context) &&
- lck2->lock_type == READ_LOCK && lck1->ntvfs == lck2->ntvfs) {
- return false;
- }
-
- return brl_ctdb_overlap(lck1, lck2);
-}
-
-
-/*
- Check to see if this lock conflicts, but ignore our own locks on the
- same fnum only.
-*/
-static bool brl_ctdb_conflict_other(struct lock_struct *lck1, struct lock_struct *lck2)
-{
- /* pending locks don't conflict with anything */
- if (lck1->lock_type >= PENDING_READ_LOCK ||
- lck2->lock_type >= PENDING_READ_LOCK) {
- return false;
- }
-
- if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK)
- return false;
-
- /*
- * note that incoming write calls conflict with existing READ
- * locks even if the context is the same. JRA. See LOCKTEST7
- * in smbtorture.
- */
- if (brl_ctdb_same_context(&lck1->context, &lck2->context) &&
- lck1->ntvfs == lck2->ntvfs &&
- (lck2->lock_type == READ_LOCK || lck1->lock_type == WRITE_LOCK)) {
- return false;
- }
-
- return brl_ctdb_overlap(lck1, lck2);
-}
-
-
-/*
- amazingly enough, w2k3 "remembers" whether the last lock failure
- is the same as this one and changes its error code. I wonder if any
- app depends on this?
-*/
-static NTSTATUS brl_ctdb_lock_failed(struct brl_handle *brlh, struct lock_struct *lock)
-{
- /*
- * this function is only called for non pending lock!
- */
-
- /* in SMB2 mode always return NT_STATUS_LOCK_NOT_GRANTED! */
- if (lock->ntvfs->ctx->protocol == PROTOCOL_SMB2) {
- return NT_STATUS_LOCK_NOT_GRANTED;
- }
-
- /*
- * if the notify_ptr is non NULL,
- * it means that we're at the end of a pending lock
- * and the real lock is requested after the timeout went by
- * In this case we need to remember the last_lock and always
- * give FILE_LOCK_CONFLICT
- */
- if (lock->notify_ptr) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list