create symbols for fetch lock response status

(This used to be ctdb commit d8243f474897dc65fb7286225b07bdf48b6faed0)

diff --git a/ctdb/common/ctdb_call.c b/ctdb/common/ctdb_call.c
index 98bb780222c5143a8eacdee7d5530b3498afbcb6..224798aecb19272b63ec4ddc05641370ceb6dc7c 100644 (file)
--- 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 1d4908e5957f710e30f1e5ed4a918ecca4730f9a..4f63da5e6cdc99c4e764474555adc261cbe58caa 100644 (file)
--- 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 d6dcdd3c4f8ea861bfa2c420887bb178277672be..a41e5152075c8bb0d375ccfc43b5dfe876c16cc2 100644 (file)
--- 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);