------------------------------------------------------------
revno: 54
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Peter Somogyi <[EMAIL PROTECTED]>
branch nick: ctdb
timestamp: Thu 2007-01-25 14:22:03 +0100
message:
Fixed a side effect of previous revert.
modified:
.bzrignore bzrignore-20061117235536-slq8jlz2b5161dfm-1
ib/ibw_ctdb_init.c
ibw_ctdb_init.c-20070102171305-cn2z4k7ibx8141d5-1
=== modified file '.bzrignore'
--- a/.bzrignore 2006-11-29 14:45:14 +0000
+++ b/.bzrignore 2007-01-25 13:22:03 +0000
@@ -1,10 +1,8 @@
config.status
Makefile
bin
-common
config.log
push.sh
ctdb_test
config.cache
configure
-configure
=== modified file 'ib/ibw_ctdb_init.c'
--- a/ib/ibw_ctdb_init.c 2007-01-05 17:13:35 +0000
+++ b/ib/ibw_ctdb_init.c 2007-01-25 13:22:03 +0000
@@ -108,6 +108,18 @@
return 0;
}
+static int ctdb_ibw_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t
length)
+{
+ struct ibw_conn *conn = talloc_get_type(node->private, struct ibw_conn);
+ int rc;
+
+ rc = ibw_send(conn, data, last_key, length);
+ last_key = NULL;
+
+ return rc;
+}
+
+#ifdef __NOTDEF__
/*
* transport packet allocator - allows transport to control memory for packets
*/
@@ -122,17 +134,6 @@
return buf;
}
-static int ctdb_ibw_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t
length)
-{
- struct ibw_conn *conn = talloc_get_type(node->private, struct ibw_conn);
- int rc;
-
- rc = ibw_send(conn, data, last_key, length);
- last_key = NULL;
-
- return rc;
-}
-
static void ctdb_ibw_dealloc_pkt(struct ctdb_node *node, void *data)
{
if (last_key) {
@@ -151,14 +152,16 @@
return ibw_stop(ictx);
}
+#endif /* __NOTDEF__ */
+
static const struct ctdb_methods ctdb_ibw_methods = {
.start = ctdb_ibw_start,
.add_node = ctdb_ibw_add_node,
.queue_pkt = ctdb_ibw_queue_pkt,
- .allocate_pkt = ctdb_ibw_allocate_pkt,
+// .allocate_pkt = ctdb_ibw_allocate_pkt,
- .dealloc_pkt = ctdb_ibw_dealloc_pkt,
- .stop = ctdb_ibw_stop
+// .dealloc_pkt = ctdb_ibw_dealloc_pkt,
+// .stop = ctdb_ibw_stop
};
/*
