change server_id.vnn to server_id.pnn

diff --git a/include/ctdb.h b/include/ctdb.h
index 64534e81a52a16dacd6b4fe9ea57d3c1afdaac7e..34c8d0877c523ba4d5e80a7acf41a4ffee7cb238 100644 (file)
--- a/include/ctdb.h
+++ b/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/server/ctdb_serverids.c b/server/ctdb_serverids.c
index 8c8c9308744253759aaaf1e3ad7d70d270c6ad54..ca9be264af94f4efdfbdd0b45af5cf35a5e7e1a4 100644 (file)
--- a/server/ctdb_serverids.c
+++ b/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/tools/ctdb.c b/tools/ctdb.c
index 9edad983cf9dc3c4e76c421bdf10d8f721d9a87b..fd944f039dbcf3d477c4e81966aedc27eb6312d4 100644 (file)
--- a/tools/ctdb.c
+++ b/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); 
        }