diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-10-29 18:37:42 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2015-11-04 00:47:16 +0100 |
| commit | 8b84a82eab2af34a29533d9bced347f672f02c0b (patch) | |
| tree | 1b80695a767f8e1d6d61ae61b02a599fd604fea1 | |
| parent | b8b737c77ac3240d63afa441aeba195a915c2353 (diff) | |
| download | samba-8b84a82eab2af34a29533d9bced347f672f02c0b.tar.gz | |
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>
| -rw-r--r-- | ctdb/client/client_db.c | 4 | ||||
| -rw-r--r-- | ctdb/client/ctdb_client.c | 4 | ||||
| -rw-r--r-- | ctdb/protocol/protocol.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ctdb/client/client_db.c b/ctdb/client/client_db.c index 97ec1f4a8fc..146c5e16938 100644 --- 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 a0c8d56bd15..7910014396e 100644 --- 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 7159071db1d..27bc8281eee 100644 --- 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 { |