diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-02 10:05:46 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 07:37:06 +0200 |
| commit | 85eb4377dbc9e2d25e0ee2e358e785347b09f0a7 (patch) | |
| tree | 6f9f20fc991926620678fba7df5aeb12b9241901 /source4/cluster | |
| parent | 8da8c36b53cc115f0d446b666fc24fc9423d808e (diff) | |
| download | samba-85eb4377dbc9e2d25e0ee2e358e785347b09f0a7.tar.gz samba-85eb4377dbc9e2d25e0ee2e358e785347b09f0a7.tar.bz2 samba-85eb4377dbc9e2d25e0ee2e358e785347b09f0a7.zip | |
s4:cluster Rename .id to .pid in server_id
This also changes some DEBUG messages to use cluster_id_string()
rather than .id, to isolate them from this and other changes.
Andrew Bartlett
Diffstat (limited to 'source4/cluster')
| -rw-r--r-- | source4/cluster/cluster.h | 2 | ||||
| -rw-r--r-- | source4/cluster/local.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h index 6cfcb9b21b..f3b47b2838 100644 --- a/source4/cluster/cluster.h +++ b/source4/cluster/cluster.h @@ -27,7 +27,7 @@ /* test for same cluster id */ -#define cluster_id_equal(id_1, id_2) ((id_1)->id == (id_2)->id \ +#define cluster_id_equal(id_1, id_2) ((id_1)->pid == (id_2)->pid \ && (id_1)->id2 == (id_2)->id2 \ && (id_1)->node == (id_2)->node) diff --git a/source4/cluster/local.c b/source4/cluster/local.c index a93b0a65ed..0dc8b869dc 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -31,11 +31,11 @@ /* server a server_id for the local node */ -static struct server_id local_id(struct cluster_ops *ops, uint64_t id, uint32_t id2) +static struct server_id local_id(struct cluster_ops *ops, uint64_t pid, uint32_t id2) { struct server_id server_id; ZERO_STRUCT(server_id); - server_id.id = id; + server_id.pid = pid; server_id.id2 = id2; return server_id; } @@ -47,7 +47,7 @@ static struct server_id local_id(struct cluster_ops *ops, uint64_t id, uint32_t static const char *local_id_string(struct cluster_ops *ops, TALLOC_CTX *mem_ctx, struct server_id id) { - return talloc_asprintf(mem_ctx, "%u.%llu.%u", id.node, (unsigned long long)id.id, id.id2); + return talloc_asprintf(mem_ctx, "%u.%llu.%u", id.node, (unsigned long long)id.pid, id.id2); } |