Fixed a side effect of previous revert.

diff --git a/.bzrignore b/.bzrignore
index f303d93c9cdeeb3844ca916f03d84f3f9390c509..b7f0a276305a465679f5281ad53e4456d340eb19 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,10 +1,8 @@
 config.status
 Makefile
 bin
-common
 config.log
 push.sh
 ctdb_test
 config.cache
 configure
-configure

diff --git a/ib/ibw_ctdb_init.c b/ib/ibw_ctdb_init.c
index 672dec6d329c77d3a3694ff1aa621416f5d8d8a1..0d4f01d763592244acad2d1289e22ff6d4eb4187 100644 (file)
--- a/ib/ibw_ctdb_init.c
+++ b/ib/ibw_ctdb_init.c
@@ -108,6 +108,18 @@ static int ctdb_ibw_add_node(struct ctdb_node *node)
        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 @@ static void *ctdb_ibw_allocate_pkt(struct ctdb_node *node, size_t size)
        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 @@ static int ctdb_ibw_stop(struct ctdb_context *cctx)
        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
 };
 
 /*