summaryrefslogtreecommitdiff
path: root/ctdb/ib
diff options
context:
space:
mode:
authorPeter Somogyi <psomogyi@gamax.hu>2007-04-19 15:52:08 +0200
committerPeter Somogyi <psomogyi@gamax.hu>2007-04-19 15:52:08 +0200
commitc950e5285830eb14f0fced820bbb2ad8927c5421 (patch)
treef194e26c76863b483948df7ba2874497312b1d22 /ctdb/ib
parenta32fa3451d407e4abea7ac9a323d890e8bb3b515 (diff)
parenteabe0bd7d4f0c9a609b617e1b58b8ba5fcd23fb9 (diff)
downloadsamba-c950e5285830eb14f0fced820bbb2ad8927c5421.tar.gz
Merged tridge's ctdb branch.
(This used to be ctdb commit d9046da5219144afe68f5a376243d998e7068ccd)
Diffstat (limited to 'ctdb/ib')
-rw-r--r--ctdb/ib/ibw_ctdb_init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/ib/ibw_ctdb_init.c b/ctdb/ib/ibw_ctdb_init.c
index 3b0c6ad28fb..b4adfe6f124 100644
--- a/ctdb/ib/ibw_ctdb_init.c
+++ b/ctdb/ib/ibw_ctdb_init.c
@@ -158,10 +158,10 @@ static int ctdb_ibw_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t le
/*
* transport packet allocator - allows transport to control memory for packets
*/
-static void *ctdb_ibw_allocate_pkt(struct ctdb_context *ctdb, size_t size)
+static void *ctdb_ibw_allocate_pkt(TALLOC_CTX *mem_ctx, size_t size)
{
/* TODO: use ibw_alloc_send_buf instead... */
- return talloc_size(ctdb, size);
+ return talloc_size(mem_ctx, size);
}
#ifdef __NOTDEF__