sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Fixed a side effect of previous revert.

Browse Source 
(This used to be ctdb commit 08d013df5c6389c471036b20758463a844d33027)
This commit is contained in:
Peter Somogyi 2007-01-25 14:22:03 +01:00
parent c11b2f642b
commit 4b8fe2af0a
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/.bzrignore
View File

@ -1,10 +1,8 @@
config.status
Makefile
bin
common
config.log
push.sh
ctdb_test
config.cache
configure
configure

31
ctdb/ib/ibw_ctdb_init.c
View File

@ -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
};
/*