svn commit: samba r20991 - in
branches/SAMBA_4_0/source/cluster/ctdb: . common tcp
tridge at samba.org
tridge at samba.org
Wed Jan 24 04:34:19 GMT 2007
Author: tridge
Date: 2007-01-24 04:34:19 +0000 (Wed, 24 Jan 2007)
New Revision: 20991
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20991
Log:
use relative includes for ctdb headers. This works with both
standalone and built-in ctdb
Modified:
branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb.c
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_call.c
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_ltdb.c
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_util.c
branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c
branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_connect.c
branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_init.c
branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_io.c
Changeset:
Modified: branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c 2007-01-24 04:30:44 UTC (rev 20990)
+++ branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c 2007-01-24 04:34:19 UTC (rev 20991)
@@ -29,7 +29,7 @@
#include "libcli/libcli.h"
#include "cluster/cluster.h"
#include "ntvfs/common/brlock.h"
-#include "cluster/ctdb/include/ctdb.h"
+#include "include/ctdb.h"
#define ENABLE_NOTIFIES 0
Modified: branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb.c 2007-01-24 04:30:44 UTC (rev 20990)
+++ branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb.c 2007-01-24 04:34:19 UTC (rev 20991)
@@ -24,7 +24,7 @@
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
/*
choose the transport we will use
Modified: branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_call.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_call.c 2007-01-24 04:30:44 UTC (rev 20990)
+++ branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_call.c 2007-01-24 04:34:19 UTC (rev 20991)
@@ -26,7 +26,7 @@
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
/*
queue a packet or die
Modified: branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_ltdb.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_ltdb.c 2007-01-24 04:30:44 UTC (rev 20990)
+++ branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_ltdb.c 2007-01-24 04:34:19 UTC (rev 20991)
@@ -23,7 +23,7 @@
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
#include "db_wrap.h"
Modified: branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_util.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_util.c 2007-01-24 04:30:44 UTC (rev 20990)
+++ branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_util.c 2007-01-24 04:34:19 UTC (rev 20991)
@@ -23,7 +23,7 @@
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
/*
return error string for last error
@@ -47,7 +47,6 @@
va_end(ap);
}
-
/*
a fatal internal error occurred - no hope for recovery
*/
Modified: branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c 2007-01-24 04:30:44 UTC (rev 20990)
+++ branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c 2007-01-24 04:34:19 UTC (rev 20991)
@@ -26,7 +26,7 @@
#include "system/filesys.h"
#include "cluster/cluster_private.h"
#include "lib/tdb/include/tdb.h"
-#include "cluster/ctdb/include/ctdb.h"
+#include "include/ctdb.h"
#include "db_wrap.h"
struct cluster_state {
Modified: branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_connect.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_connect.c 2007-01-24 04:30:44 UTC (rev 20990)
+++ branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_connect.c 2007-01-24 04:34:19 UTC (rev 20991)
@@ -23,7 +23,7 @@
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
#include "ctdb_tcp.h"
static void set_nonblocking(int fd)
Modified: branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_init.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_init.c 2007-01-24 04:30:44 UTC (rev 20990)
+++ branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_init.c 2007-01-24 04:34:19 UTC (rev 20991)
@@ -23,7 +23,7 @@
#include "lib/events/events.h"
#include "system/network.h"
#include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
#include "ctdb_tcp.h"
/*
Modified: branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_io.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_io.c 2007-01-24 04:30:44 UTC (rev 20990)
+++ branches/SAMBA_4_0/source/cluster/ctdb/tcp/tcp_io.c 2007-01-24 04:34:19 UTC (rev 20991)
@@ -24,7 +24,7 @@
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
-#include "cluster/ctdb/include/ctdb_private.h"
+#include "../include/ctdb_private.h"
#include "ctdb_tcp.h"
@@ -210,13 +210,6 @@
if (length2 != length) {
memset(data+length, 0, length2-length);
}
- {
- int i, fd = open("/dev/null", O_WRONLY);
- for (i=0;i<length2;i++) {
- write(fd, &data[i], 1);
- }
- close(fd);
- }
/* if the queue is empty then try an immediate write, avoiding
queue overhead. This relies on non-blocking sockets */
More information about the samba-cvs
mailing list