diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-08 18:28:17 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | 8d803d5a0a9a7815c4e6fcbd9b7c652fb85e94dd (patch) | |
| tree | bbe38810d02bcbc2fe58e180d4e01b6784e9c22f /source4/cluster/cluster.h | |
| parent | 8d4a8389bb2df77ff8923dda8368aa2915652c1a (diff) | |
| download | samba-8d803d5a0a9a7815c4e6fcbd9b7c652fb85e94dd.tar.gz samba-8d803d5a0a9a7815c4e6fcbd9b7c652fb85e94dd.tar.bz2 samba-8d803d5a0a9a7815c4e6fcbd9b7c652fb85e94dd.zip | |
s4-cluster Use task_id instead of id2 to clarify server_id structure
This seems a clearer and more acceptable name.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source4/cluster/cluster.h')
| -rw-r--r-- | source4/cluster/cluster.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h index 5ed9055d7b..df12c8bb27 100644 --- a/source4/cluster/cluster.h +++ b/source4/cluster/cluster.h @@ -28,7 +28,7 @@ test for same cluster id */ #define cluster_id_equal(id_1, id_2) ((id_1)->pid == (id_2)->pid \ - && (id_1)->id2 == (id_2)->id2 \ + && (id_1)->task_id == (id_2)->task_id \ && (id_1)->vnn == (id_2)->vnn) /* @@ -40,7 +40,7 @@ struct imessaging_context; typedef void (*cluster_message_fn_t)(struct imessaging_context *, DATA_BLOB); /* prototypes */ -struct server_id cluster_id(uint64_t id, uint32_t id2); +struct server_id cluster_id(uint64_t id, uint32_t task_id); char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id); struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbname, int flags); void *cluster_backend_handle(void); |