diff options
| author | Peter Somogyi <psomogyi@gamax.hu> | 2007-01-25 14:22:03 +0100 |
|---|---|---|
| committer | Peter Somogyi <psomogyi@gamax.hu> | 2007-01-25 14:22:03 +0100 |
| commit | 4b8fe2af0a9700319fb87bd09c8acd4c38ff7518 (patch) | |
| tree | eaebdbba2f66b56aa1c3280ddaaf6055b954a240 /ctdb/ib | |
| parent | c11b2f642b0743086c3c0d7b34174baaeac769d5 (diff) | |
| download | samba-4b8fe2af0a9700319fb87bd09c8acd4c38ff7518.tar.gz samba-4b8fe2af0a9700319fb87bd09c8acd4c38ff7518.tar.xz samba-4b8fe2af0a9700319fb87bd09c8acd4c38ff7518.zip | |
Fixed a side effect of previous revert.
(This used to be ctdb commit 08d013df5c6389c471036b20758463a844d33027)
Diffstat (limited to 'ctdb/ib')
| -rw-r--r-- | ctdb/ib/ibw_ctdb_init.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/ctdb/ib/ibw_ctdb_init.c b/ctdb/ib/ibw_ctdb_init.c index 672dec6d32..0d4f01d763 100644 --- a/ctdb/ib/ibw_ctdb_init.c +++ b/ctdb/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 }; /* |