diff options
| author | Ronnie Sahlberg <sahlberg@ronnie> | 2007-09-04 10:21:51 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <sahlberg@ronnie> | 2007-09-04 10:21:51 +1000 |
| commit | 6f693bbcbd44ca56f4267ff3cce5c54dee7c39c1 (patch) | |
| tree | 02b978d84c43e230c727bd2f22b8e1cca78126f8 | |
| parent | 583b6e6ba673c33202359685580c60f3194091a5 (diff) | |
change server_id.vnn to server_id.pnn
(This used to be ctdb commit 26f2ee2b754a9271454412f05111a19b3013c6eb)
| -rw-r--r-- | ctdb/include/ctdb.h | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_serverids.c | 2 | ||||
| -rw-r--r-- | ctdb/tools/ctdb.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ctdb/include/ctdb.h b/ctdb/include/ctdb.h index 64534e81a5..34c8d0877c 100644 --- a/ctdb/include/ctdb.h +++ b/ctdb/include/ctdb.h @@ -418,7 +418,7 @@ enum ctdb_server_id_type { SERVER_TYPE_SAMBA=1 }; struct ctdb_server_id { enum ctdb_server_id_type type; - uint32_t vnn; + uint32_t pnn; uint32_t server_id; }; diff --git a/ctdb/server/ctdb_serverids.c b/ctdb/server/ctdb_serverids.c index 8c8c930874..ca9be264af 100644 --- a/ctdb/server/ctdb_serverids.c +++ b/ctdb/server/ctdb_serverids.c @@ -27,7 +27,7 @@ static uint32_t *get_server_id_key(struct ctdb_server_id *server_id) static uint32_t key[SERVER_ID_KEY_SIZE]; key[0] = server_id->type; - key[1] = server_id->vnn; + key[1] = server_id->pnn; key[2] = server_id->server_id; return &key[0]; diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 9edad983cf..fd944f039d 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -390,7 +390,7 @@ static int regsrvid(struct ctdb_context *ctdb, int argc, const char **argv) usage(); } - server_id.vnn = strtoul(argv[0], NULL, 0); + server_id.pnn = strtoul(argv[0], NULL, 0); server_id.type = strtoul(argv[1], NULL, 0); server_id.server_id = strtoul(argv[2], NULL, 0); @@ -414,7 +414,7 @@ static int unregsrvid(struct ctdb_context *ctdb, int argc, const char **argv) usage(); } - server_id.vnn = strtoul(argv[0], NULL, 0); + server_id.pnn = strtoul(argv[0], NULL, 0); server_id.type = strtoul(argv[1], NULL, 0); server_id.server_id = strtoul(argv[2], NULL, 0); @@ -439,7 +439,7 @@ static int chksrvid(struct ctdb_context *ctdb, int argc, const char **argv) usage(); } - server_id.vnn = strtoul(argv[0], NULL, 0); + server_id.pnn = strtoul(argv[0], NULL, 0); server_id.type = strtoul(argv[1], NULL, 0); server_id.server_id = strtoul(argv[2], NULL, 0); @@ -450,9 +450,9 @@ static int chksrvid(struct ctdb_context *ctdb, int argc, const char **argv) } if (status) { - printf("Server id %d:%d:%d EXISTS\n", server_id.vnn, server_id.type, server_id.server_id); + printf("Server id %d:%d:%d EXISTS\n", server_id.pnn, server_id.type, server_id.server_id); } else { - printf("Server id %d:%d:%d does NOT exist\n", server_id.vnn, server_id.type, server_id.server_id); + printf("Server id %d:%d:%d does NOT exist\n", server_id.pnn, server_id.type, server_id.server_id); } return 0; } @@ -473,7 +473,7 @@ static int getsrvids(struct ctdb_context *ctdb, int argc, const char **argv) for (i=0; i<server_ids->num; i++) { printf("Server id %d:%d:%d\n", - server_ids->server_ids[i].vnn, + server_ids->server_ids[i].pnn, server_ids->server_ids[i].type, server_ids->server_ids[i].server_id); } |