diff options
| -rw-r--r-- | ctdb/common/ctdb_call.c | 4 | ||||
| -rw-r--r-- | ctdb/common/ctdb_client.c | 6 | ||||
| -rw-r--r-- | ctdb/include/ctdb.h | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/ctdb/common/ctdb_call.c b/ctdb/common/ctdb_call.c index 98bb780222..224798aecb 100644 --- a/ctdb/common/ctdb_call.c +++ b/ctdb/common/ctdb_call.c @@ -775,10 +775,10 @@ int ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx, ret = ctdb_call_recv(state, &call); if (ret != 0) { talloc_free(rec); - return -6; + return FETCH_LOCK_DMASTERFAILED; } - return 0; + return FETCH_LOCK_SUCCESS; } diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c index 1d4908e595..4f63da5e6c 100644 --- a/ctdb/common/ctdb_client.c +++ b/ctdb/common/ctdb_client.c @@ -528,13 +528,13 @@ int ctdb_client_fetch_lock(struct ctdb_db_context *ctdb_db, ret = ctdb_ltdb_lock(ctdb_db, key); if (ret != 0) { printf("failed to lock ltdb record\n"); - return -1; + return FETCH_LOCK_LOCKFAILED; } ret = ctdb_ltdb_fetch(ctdb_db, key, &header, ctdb_db, data); if (ret != 0) { ctdb_ltdb_unlock(ctdb_db, key); - return -2; + return FETCH_LOCK_FETCHFAILED; } @@ -545,7 +545,7 @@ int ctdb_client_fetch_lock(struct ctdb_db_context *ctdb_db, ret = ctdb_client_fetch_lock_recv(state, mem_ctx, key, data); if (ret != 0) { ctdb_ltdb_unlock(ctdb_db, key); - return -3; + return FETCH_LOCK_DMASTERFAILED; } } diff --git a/ctdb/include/ctdb.h b/ctdb/include/ctdb.h index d6dcdd3c4f..a41e515207 100644 --- a/ctdb/include/ctdb.h +++ b/ctdb/include/ctdb.h @@ -182,6 +182,11 @@ int ctdb_fetch_lock(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx, TDB_DA /* do a fetch lock from a client to the local daemon */ +#define FETCH_LOCK_SUCCESS 0 +#define FETCH_LOCK_LOCKFAILED 1 +#define FETCH_LOCK_FETCHFAILED 2 +#define FETCH_LOCK_DMASTERFAILED 3 + int ctdb_client_fetch_lock(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx, TDB_DATA key, TDB_DATA *data); |