ctdb-protocol: Rename G_LOCK_READ/WRITE to CTDB_G_LOCK_READ/WRITE

to avoid clash with definitions from source3/include/g_lock.h.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/client/client_db.c b/ctdb/client/client_db.c
index 97ec1f4a8fc76f36278e7574b8d05350c7e4ae93..146c5e1693840f488b3ddf37d60f834799b68c1a 100644 (file)
--- a/ctdb/client/client_db.c
+++ b/ctdb/client/client_db.c
@@ -1090,7 +1090,7 @@ static void ctdb_g_lock_lock_retry(struct tevent_req *subreq);
 static bool ctdb_g_lock_conflicts(enum ctdb_g_lock_type l1,
                                  enum ctdb_g_lock_type l2)
 {
-       if ((l1 == G_LOCK_READ) && (l2 == G_LOCK_READ)) {
+       if ((l1 == CTDB_G_LOCK_READ) && (l2 == CTDB_G_LOCK_READ)) {
                return false;
        }
        return true;
@@ -1119,7 +1119,7 @@ struct tevent_req *ctdb_g_lock_lock_send(TALLOC_CTX *mem_ctx,
        state->key.dptr = discard_const(keyname);
        state->key.dsize = strlen(keyname) + 1;
        state->my_sid = *sid;
-       state->lock_type = (readonly ? G_LOCK_READ : G_LOCK_WRITE);
+       state->lock_type = (readonly ? CTDB_G_LOCK_READ : CTDB_G_LOCK_WRITE);
 
        subreq = ctdb_fetch_lock_send(state, ev, client, db, state->key,
                                      false);

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index a0c8d56bd153bda7945ba37fafd00c079a0200a2..7910014396ed3dd18aaedf668b18f86f7c335462 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -3892,8 +3892,8 @@ static bool server_id_exists(struct ctdb_context *ctdb, struct ctdb_server_id *i
 
 
 enum ctdb_g_lock_type {
-       G_LOCK_READ = 0,
-       G_LOCK_WRITE = 1,
+       CTDB_G_LOCK_READ = 0,
+       CTDB_G_LOCK_WRITE = 1,
 };
 
 struct ctdb_g_lock {

diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h
index 7159071db1d260cfff37cab47b89b173b0293a76..27bc8281eee2a94295d880284c54bef8d8875b66 100644 (file)
--- a/ctdb/protocol/protocol.h
+++ b/ctdb/protocol/protocol.h
@@ -1001,8 +1001,8 @@ struct ctdb_server_id {
 };
 
 enum ctdb_g_lock_type {
-       G_LOCK_READ = 0,
-       G_LOCK_WRITE = 1,
+       CTDB_G_LOCK_READ = 0,
+       CTDB_G_LOCK_WRITE = 1,
 };
 
 struct ctdb_g_lock {