From 03c69d8400f6a50f614ab2800c1988b90f4ba60a Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Thu, 29 Oct 2015 17:36:23 +1100 Subject: [PATCH] ctdb-include: Remove unused definitions Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- ctdb/include/ctdb_protocol.h | 6 ------ ctdb/tests/src/ctdb_bench.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ctdb/include/ctdb_protocol.h b/ctdb/include/ctdb_protocol.h index 9dd701dfc48..57a8edda199 100644 --- a/ctdb/include/ctdb_protocol.h +++ b/ctdb/include/ctdb_protocol.h @@ -59,9 +59,6 @@ struct ctdb_call_info { uint32_t status; /* optional reply status - defaults to zero */ }; -#define CTDB_ERR_INVALID 1 -#define CTDB_ERR_NOMEM 2 - /* ctdb flags */ @@ -207,9 +204,6 @@ struct ctdb_call_info { /* send a broadcast to selected connected nodes */ #define CTDB_MULTICAST 0xF0000005 -/* the key used for transaction locking on persistent databases */ -#define CTDB_TRANSACTION_LOCK_KEY "__transaction_lock__" - /* the key used to store persistent db sequence number */ #define CTDB_DB_SEQNUM_KEY "__db_sequence_number__" diff --git a/ctdb/tests/src/ctdb_bench.c b/ctdb/tests/src/ctdb_bench.c index 536782c8e6b..3725f766cb9 100644 --- a/ctdb/tests/src/ctdb_bench.c +++ b/ctdb/tests/src/ctdb_bench.c @@ -64,7 +64,7 @@ static int incr_func(struct ctdb_call_info *call) if (call->record_data.dsize == 0) { call->new_data = talloc(call, TDB_DATA); if (call->new_data == NULL) { - return CTDB_ERR_NOMEM; + return ENOMEM; } call->new_data->dptr = talloc_size(call, 4); call->new_data->dsize = 4;