Update manpage links, fix doc typo in fssync-debug
[openafs.git] / src / vol / fssync-debug.c
index 651c943..0f4ced9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2008, Sine Nomine Associates and others.
+ * Copyright 2006-2010, Sine Nomine Associates and others.
  * All Rights Reserved.
  * 
  * This software has been released under the terms of the IBM Public
@@ -18,8 +18,6 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -42,7 +40,6 @@ RCSID
 #include <afs/afsint.h>
 #include <afs/assert.h>
 
-
 #include <fcntl.h>
 
 #ifndef AFS_NT40_ENV
@@ -50,6 +47,7 @@ RCSID
 #endif
 
 #include <afs/cmd.h>
+#include <afs/dir.h>
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>
 
@@ -59,9 +57,13 @@ RCSID
 #include "ihandle.h"
 #include "vnode.h"
 #include "volume.h"
+#include "volume_inline.h"
 #include "partition.h"
 #include "daemon_com.h"
+#include "daemon_com_inline.h"
 #include "fssync.h"
+#include "fssync_inline.h"
+#include "vg_cache.h"
 #ifdef AFS_NT40_ENV
 #include <pthread.h>
 #endif
@@ -86,11 +88,6 @@ static int common_volop_prolog(struct cmd_syndesc *, struct state *);
 
 static int do_volop(struct state *, afs_int32 command, SYNC_response * res);
 
-static char * response_code_to_string(afs_int32);
-static char * command_code_to_string(afs_int32);
-static char * reason_code_to_string(afs_int32);
-static char * program_type_to_string(afs_int32);
-
 static int VolOnline(struct cmd_syndesc * as, void * rock);
 static int VolOffline(struct cmd_syndesc * as, void * rock);
 static int VolMode(struct cmd_syndesc * as, void * rock);
@@ -107,6 +104,12 @@ static int VolOpQuery(struct cmd_syndesc * as, void * rock);
 static int StatsQuery(struct cmd_syndesc * as, void * rock);
 static int VnQuery(struct cmd_syndesc * as, void * rock);
 
+static int VGCQuery(struct cmd_syndesc * as, void * rock);
+static int VGCAdd(struct cmd_syndesc * as, void * rock);
+static int VGCDel(struct cmd_syndesc * as, void * rock);
+static int VGCScan(struct cmd_syndesc * as, void * rock);
+static int VGCScanAll(struct cmd_syndesc * as, void * rock);
+
 static void print_vol_stats_general(VolPkgStats * stats);
 static void print_vol_stats_viceP(struct DiskPartitionStats64 * stats);
 static void print_vol_stats_hash(struct VolumeHashChainStats * stats);
@@ -145,8 +148,6 @@ main(int argc, char **argv)
 {
     struct cmd_syndesc *ts;
     int err = 0;
-    int i;
-    extern char cml_version_number[];
 
     /* Initialize directory paths */
     if (!(initAFSDirPath() & AFSDIR_SERVER_PATHS_OK)) {
@@ -209,7 +210,7 @@ main(int argc, char **argv)
     cmd_AddParm(ts, "-volumeid", CMD_SINGLE, 0, "volume id");
     cmd_AddParm(ts, "-vnodeid", CMD_SINGLE, 0, "vnode id");
     cmd_AddParm(ts, "-unique", CMD_SINGLE, 0, "uniquifier");
-    cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "paritition name");
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
     COMMON_PARMS_DECL(ts);
 
     ts = cmd_CreateSyntax("stats", StatsQuery, NULL, "see 'stats help' for more information");
@@ -219,6 +220,39 @@ main(int argc, char **argv)
     cmd_AddParm(ts, "-arg2", CMD_SINGLE, CMD_OPTIONAL, "arg2");
     COMMON_PARMS_DECL(ts);
 
+    ts = cmd_CreateSyntax("vgcquery", VGCQuery, 0, "query volume group cache (FSYNC_VG_QUERY opcode)");
+    cmd_Seek(ts, CUSTOM_PARMS_OFFSET);
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
+    cmd_AddParm(ts, "-volumeid", CMD_SINGLE, 0, "volume id");
+    COMMON_PARMS_DECL(ts);
+    cmd_CreateAlias(ts, "vgcqry");
+
+    ts = cmd_CreateSyntax("vgcadd", VGCAdd, 0, "add entry to volume group cache (FSYNC_VG_ADD opcode)");
+    cmd_Seek(ts, CUSTOM_PARMS_OFFSET);
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
+    cmd_AddParm(ts, "-parent", CMD_SINGLE, 0, "parent volume id");
+    cmd_AddParm(ts, "-child", CMD_SINGLE, 0, "child volume id");
+    COMMON_PARMS_DECL(ts);
+
+    ts = cmd_CreateSyntax("vgcdel", VGCDel, 0, "delete entry from volume group cache (FSYNC_VG_DEL opcode)");
+    cmd_Seek(ts, CUSTOM_PARMS_OFFSET);
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
+    cmd_AddParm(ts, "-parent", CMD_SINGLE, 0, "parent volume id");
+    cmd_AddParm(ts, "-child", CMD_SINGLE, 0, "child volume id");
+    COMMON_PARMS_DECL(ts);
+
+    ts = cmd_CreateSyntax("vgcscan", VGCScan, 0,
+                         "start volume group cache re-scan"
+                         " (FSYNC_VG_SCAN opcode)");
+    cmd_Seek(ts, CUSTOM_PARMS_OFFSET);
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
+    COMMON_PARMS_DECL(ts);
+
+    ts = cmd_CreateSyntax("vgcscanall", VGCScanAll, 0,
+                         "start whole-server volume group cache re-scan"
+                         " (FSYNC_VG_SCAN_ALL opcode)");
+    COMMON_PARMS_DECL(ts);
+
     err = cmd_Dispatch(argc, argv);
     exit(err);
 }
@@ -227,6 +261,7 @@ static int
 common_prolog(struct cmd_syndesc * as, struct state * state)
 {
     register struct cmd_item *ti;
+    VolumePackageOptions opts;
 
 #ifdef AFS_NT40_ENV
     if (afs_winsockInit() < 0) {
@@ -234,8 +269,14 @@ common_prolog(struct cmd_syndesc * as, struct state * state)
     }
 #endif
 
-    VInitVolumePackage(debugUtility, 1, 1,
-                      DONT_CONNECT_FS, 0);
+    VOptDefaults(debugUtility, &opts);
+    if (VInitVolumePackage2(debugUtility, &opts)) {
+       /* VInitVolumePackage2 can fail on e.g. partition attachment errors,
+        * but we don't really care, since all we're doing is trying to use
+        * FSSYNC */
+       fprintf(stderr, "errors encountered initializing volume package, but "
+                       "trying to continue anyway\n");
+    }
     DInit(1);
 
     if ((ti = as->parms[COMMON_PARMS_OFFSET].items)) { /* -reason */
@@ -250,6 +291,10 @@ common_prolog(struct cmd_syndesc * as, struct state * state)
            programType = salvager;
        } else if (!strcmp(ti->data, "salvageServer")) {
            programType = salvageServer;
+       } else if (!strcmp(ti->data, "volumeServer")) {
+           programType = volumeServer;
+       } else if (!strcmp(ti->data, "volumeSalvager")) {
+           programType = volumeSalvager;
        } else {
            programType = (ProgramType) atoi(ti->data);
        }
@@ -264,7 +309,6 @@ static int
 common_volop_prolog(struct cmd_syndesc * as, struct state * state)
 {
     register struct cmd_item *ti;
-    char pname[100], *temp;
 
     state->vop = (struct volop_state *) calloc(1, sizeof(struct volop_state));
     assert(state->vop != NULL);
@@ -285,6 +329,29 @@ common_volop_prolog(struct cmd_syndesc * as, struct state * state)
 }
 
 static int
+debug_response(afs_int32 code, SYNC_response * res)
+{
+    switch (code) {
+    case SYNC_OK:
+    case SYNC_DENIED:
+       break;
+    default:
+       fprintf(stderr, "warning: response code indicates possible protocol error.\n");
+    }
+
+    fprintf(stderr, "FSSYNC service returned %d (%s)\n", code, SYNC_res2string(code));
+
+    if (res) {
+       fprintf(stderr, "protocol header response code was %d (%s)\n",
+               res->hdr.response, SYNC_res2string(res->hdr.response));
+       fprintf(stderr, "protocol reason code was %d (%s)\n",
+               res->hdr.reason, FSYNC_reason2string(res->hdr.reason));
+    }
+
+    return 0;
+}
+
+static int
 do_volop(struct state * state, afs_int32 command, SYNC_response * res)
 {
     afs_int32 code;
@@ -298,7 +365,7 @@ do_volop(struct state * state, afs_int32 command, SYNC_response * res)
     }
 
     fprintf(stderr, "calling FSYNC_VolOp with command code %d (%s)\n", 
-           command, command_code_to_string(command));
+           command, FSYNC_com2string(command));
 
     code = FSYNC_VolOp(state->vop->volume,
                       state->vop->partName,
@@ -306,21 +373,12 @@ do_volop(struct state * state, afs_int32 command, SYNC_response * res)
                       state->reason,
                       res);
 
-    switch (code) {
-    case SYNC_OK:
-    case SYNC_DENIED:
-       break;
-    default:
-       fprintf(stderr, "possible sync protocol error. return code was %d\n", code);
-    }
-
-    fprintf(stderr, "FSYNC_VolOp returned %d (%s)\n", code, response_code_to_string(code));
-    fprintf(stderr, "protocol response code was %d (%s)\n", 
-           res->hdr.response, response_code_to_string(res->hdr.response));
-    fprintf(stderr, "protocol reason code was %d (%s)\n", 
-           res->hdr.reason, reason_code_to_string(res->hdr.reason));
+    debug_response(code, res);
 
     VDisconnectFS();
+
+    return 0;
+
 }
 
 
@@ -341,86 +399,6 @@ do_volop(struct state * state, afs_int32 command, SYNC_response * res)
         } \
     } while (0)
 
-static char *
-response_code_to_string(afs_int32 response)
-{
-    switch (response) {
-       ENUMCASE(SYNC_OK);
-       ENUMCASE(SYNC_DENIED);
-       ENUMCASE(SYNC_COM_ERROR);
-       ENUMCASE(SYNC_BAD_COMMAND);
-       ENUMCASE(SYNC_FAILED);
-    default:
-       return "**UNKNOWN**";
-    }
-}
-
-static char *
-command_code_to_string(afs_int32 command)
-{
-    switch (command) {
-       ENUMCASE(SYNC_COM_CHANNEL_CLOSE);
-       ENUMCASE(FSYNC_VOL_ON);
-       ENUMCASE(FSYNC_VOL_OFF);
-       ENUMCASE(FSYNC_VOL_LISTVOLUMES);
-       ENUMCASE(FSYNC_VOL_NEEDVOLUME);
-       ENUMCASE(FSYNC_VOL_MOVE);
-       ENUMCASE(FSYNC_VOL_BREAKCBKS);
-       ENUMCASE(FSYNC_VOL_DONE);
-       ENUMCASE(FSYNC_VOL_QUERY);
-       ENUMCASE(FSYNC_VOL_QUERY_HDR);
-       ENUMCASE(FSYNC_VOL_QUERY_VOP);
-       ENUMCASE(FSYNC_VOL_STATS_GENERAL);
-       ENUMCASE(FSYNC_VOL_STATS_VICEP);
-       ENUMCASE(FSYNC_VOL_STATS_HASH);
-       ENUMCASE(FSYNC_VOL_STATS_HDR);
-       ENUMCASE(FSYNC_VOL_STATS_VLRU);
-       ENUMCASE(FSYNC_VOL_ATTACH);
-       ENUMCASE(FSYNC_VOL_FORCE_ERROR);
-       ENUMCASE(FSYNC_VOL_LEAVE_OFF);
-       ENUMCASE(FSYNC_VOL_QUERY_VNODE);
-    default:
-       return "**UNKNOWN**";
-    }
-}
-
-static char *
-reason_code_to_string(afs_int32 reason)
-{
-    switch (reason) {
-       ENUMCASE(SYNC_REASON_NONE);
-       ENUMCASE(SYNC_REASON_MALFORMED_PACKET);
-       ENUMCASE(SYNC_REASON_NOMEM);
-       ENUMCASE(SYNC_REASON_ENCODING_ERROR);
-       ENUMCASE(FSYNC_WHATEVER);
-       ENUMCASE(FSYNC_SALVAGE);
-       ENUMCASE(FSYNC_MOVE);
-       ENUMCASE(FSYNC_OPERATOR);
-       ENUMCASE(FSYNC_EXCLUSIVE);
-       ENUMCASE(FSYNC_UNKNOWN_VOLID);
-       ENUMCASE(FSYNC_HDR_NOT_ATTACHED);
-       ENUMCASE(FSYNC_NO_PENDING_VOL_OP);
-       ENUMCASE(FSYNC_VOL_PKG_ERROR);
-       ENUMCASE(FSYNC_UNKNOWN_VNID);
-    default:
-       return "**UNKNOWN**";
-    }
-}
-
-static char *
-program_type_to_string(afs_int32 type)
-{
-    switch ((ProgramType)type) {
-       ENUMCASE(fileServer);
-       ENUMCASE(volumeUtility);
-       ENUMCASE(salvager);
-       ENUMCASE(salvageServer);
-       ENUMCASE(debugUtility);
-    default:
-       return "**UNKNOWN**";
-    }
-}
-
 static int 
 VolOnline(struct cmd_syndesc * as, void * rock)
 {
@@ -658,7 +636,9 @@ VolQuery(struct cmd_syndesc * as, void * rock)
     SYNC_PROTO_BUF_DECL(res_buf);
     SYNC_response res;
     Volume v;
+#ifdef AFS_DEMAND_ATTACH_FS
     int hi, lo;
+#endif
 
     res.hdr.response_len = sizeof(res.hdr);
     res.payload.buf = res_buf;
@@ -674,12 +654,12 @@ VolQuery(struct cmd_syndesc * as, void * rock)
 
        printf("volume = {\n");
        printf("\thashid          = %u\n", v.hashid);
-       printf("\theader          = 0x%x\n", v.header);
+       printf("\theader          = %p\n", v.header);
        printf("\tdevice          = %d\n", v.device);
-       printf("\tpartition       = 0x%x\n", v.partition);
-       printf("\tlinkHandle      = 0x%x\n", v.linkHandle);
+       printf("\tpartition       = %p\n", v.partition);
+       printf("\tlinkHandle      = %p\n", v.linkHandle);
        printf("\tnextVnodeUnique = %u\n", v.nextVnodeUnique);
-       printf("\tdiskDataHandle  = 0x%x\n", v.diskDataHandle);
+       printf("\tdiskDataHandle  = %p\n", v.diskDataHandle);
        printf("\tvnodeHashOffset = %u\n", v.vnodeHashOffset);
        printf("\tshuttingDown    = %d\n", v.shuttingDown);
        printf("\tgoingOffline    = %d\n", v.goingOffline);
@@ -690,14 +670,14 @@ VolQuery(struct cmd_syndesc * as, void * rock)
        printf("\tupdateTime      = %u\n", v.updateTime);
        
        printf("\tvnodeIndex[vSmall] = {\n");
-        printf("\t\thandle       = 0x%x\n", v.vnodeIndex[vSmall].handle);
-        printf("\t\tbitmap       = 0x%x\n", v.vnodeIndex[vSmall].bitmap);
+        printf("\t\thandle       = %p\n", v.vnodeIndex[vSmall].handle);
+        printf("\t\tbitmap       = %p\n", v.vnodeIndex[vSmall].bitmap);
        printf("\t\tbitmapSize   = %u\n", v.vnodeIndex[vSmall].bitmapSize);
        printf("\t\tbitmapOffset = %u\n", v.vnodeIndex[vSmall].bitmapOffset);
        printf("\t}\n");
        printf("\tvnodeIndex[vLarge] = {\n");
-        printf("\t\thandle       = 0x%x\n", v.vnodeIndex[vLarge].handle);
-        printf("\t\tbitmap       = 0x%x\n", v.vnodeIndex[vLarge].bitmap);
+        printf("\t\thandle       = %p\n", v.vnodeIndex[vLarge].handle);
+        printf("\t\tbitmap       = %p\n", v.vnodeIndex[vLarge].bitmap);
        printf("\t\tbitmapSize   = %u\n", v.vnodeIndex[vLarge].bitmapSize);
        printf("\t\tbitmapOffset = %u\n", v.vnodeIndex[vLarge].bitmapOffset);
        printf("\t}\n");
@@ -766,7 +746,7 @@ VolQuery(struct cmd_syndesc * as, void * rock)
            printf("\t}\n");
 
            /* volume op state */
-           printf("\tpending_vol_op  = 0x%x\n", v.pending_vol_op);
+           printf("\tpending_vol_op  = %p\n", v.pending_vol_op);
        }
 #else /* !AFS_DEMAND_ATTACH_FS */
        if (res.hdr.flags & SYNC_FLAG_DAFS_EXTENSIONS) {
@@ -811,7 +791,7 @@ VolHdrQuery(struct cmd_syndesc * as, void * rock)
        printf("\tid               = %u\n", v.id);
        printf("\tname             = '%s'\n", v.name);
        if (v.inUse != 0) {
-           printf("\tinUse            = %d (%s)\n", v.inUse, program_type_to_string(v.inUse));
+           printf("\tinUse            = %d (%s)\n", v.inUse, VPTypeToString(v.inUse));
        } else {
            printf("\tinUse            = %d (no)\n", v.inUse);
        }
@@ -863,7 +843,6 @@ VolOpQuery(struct cmd_syndesc * as, void * rock)
     SYNC_PROTO_BUF_DECL(res_buf);
     SYNC_response res;
     FSSYNC_VolOp_info vop;
-    int i;
 
     res.hdr.response_len = sizeof(res.hdr);
     res.payload.buf = res_buf;
@@ -889,15 +868,15 @@ VolOpQuery(struct cmd_syndesc * as, void * rock)
        printf("\t\tpkt_seq        = %u\n", vop.com.pkt_seq);
        printf("\t\tcom_seq        = %u\n", vop.com.com_seq);
        printf("\t\tprogramType    = %d (%s)\n", 
-              vop.com.programType, program_type_to_string(vop.com.programType));
+              vop.com.programType, VPTypeToString(vop.com.programType));
        printf("\t\tpid            = %d\n", vop.com.pid);
        printf("\t\ttid            = %d\n", vop.com.tid);
        printf("\t\tcommand        = %d (%s)\n", 
-              vop.com.command, command_code_to_string(vop.com.command));
+              vop.com.command, FSYNC_com2string(vop.com.command));
        printf("\t\treason         = %d (%s)\n", 
-              vop.com.reason, reason_code_to_string(vop.com.reason));
+              vop.com.reason, FSYNC_reason2string(vop.com.reason));
        printf("\t\tcommand_len    = %u\n", vop.com.command_len);
-       printf("\t\tflags          = 0x%x\n", vop.com.flags);
+       printf("\t\tflags          = 0x%lux\n", afs_printable_uint32_lu(vop.com.flags));
        printf("\t}\n");
 
        printf("\tvop = {\n");
@@ -920,7 +899,6 @@ static int
 vn_prolog(struct cmd_syndesc * as, struct state * state)
 {
     register struct cmd_item *ti;
-    char pname[100], *temp;
 
     state->vop = (struct volop_state *) calloc(1, sizeof(struct volop_state));
     assert(state->vop != NULL);
@@ -966,23 +944,11 @@ do_vnqry(struct state * state, SYNC_response * res)
     strlcpy(qry.partName, state->vop->partName, sizeof(qry.partName));
 
     fprintf(stderr, "calling FSYNC_GenericOp with command code %d (%s)\n", 
-           command, command_code_to_string(command));
+           command, FSYNC_com2string(command));
 
     code = FSYNC_GenericOp(&qry, sizeof(qry), command, FSYNC_OPERATOR, res);
 
-    switch (code) {
-    case SYNC_OK:
-    case SYNC_DENIED:
-       break;
-    default:
-       fprintf(stderr, "possible sync protocol error. return code was %d\n", code);
-    }
-
-    fprintf(stderr, "FSYNC_GenericOp returned %d (%s)\n", code, response_code_to_string(code));
-    fprintf(stderr, "protocol response code was %d (%s)\n", 
-           res->hdr.response, response_code_to_string(res->hdr.response));
-    fprintf(stderr, "protocol reason code was %d (%s)\n", 
-           res->hdr.reason, reason_code_to_string(res->hdr.reason));
+    debug_response(code, res);
 
     VDisconnectFS();
 
@@ -996,7 +962,6 @@ VnQuery(struct cmd_syndesc * as, void * rock)
     SYNC_PROTO_BUF_DECL(res_buf);
     SYNC_response res;
     Vnode v;
-    int hi, lo;
 
     res.hdr.response_len = sizeof(res.hdr);
     res.payload.buf = res_buf;
@@ -1008,24 +973,24 @@ VnQuery(struct cmd_syndesc * as, void * rock)
     do_vnqry(&state, &res);
 
     if (res.hdr.response == SYNC_OK) {
-       memcpy(&v, res.payload.buf, sizeof(Volume));
+       memcpy(&v, res.payload.buf, sizeof(Vnode));
 
        printf("vnode = {\n");
 
        printf("\tvid_hash = {\n");
-       printf("\t\tnext = 0x%lx\n", v.vid_hash.next);
-       printf("\t\tprev = 0x%lx\n", v.vid_hash.prev);
+       printf("\t\tnext = %p\n", v.vid_hash.next);
+       printf("\t\tprev = %p\n", v.vid_hash.prev);
        printf("\t}\n");
 
-       printf("\thashNext        = 0x%lx\n", v.hashNext);
-       printf("\tlruNext         = 0x%lx\n", v.lruNext);
-       printf("\tlruPrev         = 0x%lx\n", v.lruPrev);
+       printf("\thashNext        = %p\n", v.hashNext);
+       printf("\tlruNext         = %p\n", v.lruNext);
+       printf("\tlruPrev         = %p\n", v.lruPrev);
        printf("\thashIndex       = %hu\n", v.hashIndex);
        printf("\tchanged_newTime = %u\n", (unsigned int) v.changed_newTime);
        printf("\tchanged_oldTime = %u\n", (unsigned int) v.changed_oldTime);
        printf("\tdelete          = %u\n", (unsigned int) v.delete);
        printf("\tvnodeNumber     = %u\n", v.vnodeNumber);
-       printf("\tvolumePtr       = 0x%lx\n", v.volumePtr);
+       printf("\tvolumePtr       = %p\n", v.volumePtr);
        printf("\tnUsers          = %u\n", v.nUsers);
        printf("\tcacheCheck      = %u\n", v.cacheCheck);
 
@@ -1049,9 +1014,8 @@ VnQuery(struct cmd_syndesc * as, void * rock)
        }
 #endif /* !AFS_DEMAND_ATTACH_FS */
 
-       printf("\twriter          = %u\n", v.writer);
-       printf("\tvcp             = 0x%lx\n", v.vcp);
-       printf("\thandle          = 0x%lx\n", v.handle);
+       printf("\tvcp             = %p\n", v.vcp);
+       printf("\thandle          = %p\n", v.handle);
 
        printf("\tdisk = {\n");
        printf("\t\ttype              = %u\n", v.disk.type);
@@ -1076,7 +1040,7 @@ VnQuery(struct cmd_syndesc * as, void * rock)
        printf("\t\tserverModifyTime  = %u\n", v.disk.serverModifyTime);
        printf("\t\tgroup             = %d\n", v.disk.group);
        printf("\t\tvn_ino_hi         = %d\n", v.disk.vn_ino_hi);
-       printf("\t\treserved6         = %u\n", v.disk.reserved6);
+       printf("\t\tvn_length_hi      = %u\n", v.disk.vn_length_hi);
        printf("\t}\n");
 
        printf("}\n");
@@ -1097,17 +1061,7 @@ StatsQuery(struct cmd_syndesc * as, void * rock)
     SYNC_PROTO_BUF_DECL(res_buf);
     SYNC_response res;
     FSSYNC_StatsOp_hdr scom;
-    union {
-       void * ptr;
-       struct VolPkgStats * vol_stats;
-       struct VolumeHashChainStats * hash_stats;
-#ifdef AFS_DEMAND_ATTACH_FS
-       struct volume_hdr_LRU_stats * hdr_stats;
-#endif
-       struct DiskPartitionStats64 * vicep_stats;
-    } sres;
 
-    sres.ptr = res_buf;
     res.hdr.response_len = sizeof(res.hdr);
     res.payload.buf = res_buf;
     res.payload.len = SYNC_PROTO_MAX_LEN;
@@ -1171,7 +1125,7 @@ StatsQuery(struct cmd_syndesc * as, void * rock)
     common_prolog(as, &state);
 
     fprintf(stderr, "calling FSYNC_askfs with command code %d (%s)\n", 
-           command, command_code_to_string(command));
+           command, FSYNC_com2string(command));
 
     code = FSYNC_StatsOp(&scom, command, FSYNC_WHATEVER, &res);
 
@@ -1183,29 +1137,45 @@ StatsQuery(struct cmd_syndesc * as, void * rock)
        fprintf(stderr, "possible sync protocol error. return code was %d\n", code);
     }
 
-    fprintf(stderr, "FSYNC_VolOp returned %d (%s)\n", code, response_code_to_string(code));
+    fprintf(stderr, "FSYNC_VolOp returned %d (%s)\n", code, SYNC_res2string(code));
     fprintf(stderr, "protocol response code was %d (%s)\n", 
-           res.hdr.response, response_code_to_string(res.hdr.response));
+           res.hdr.response, SYNC_res2string(res.hdr.response));
     fprintf(stderr, "protocol reason code was %d (%s)\n", 
-           res.hdr.reason, reason_code_to_string(res.hdr.reason));
+           res.hdr.reason, FSYNC_reason2string(res.hdr.reason));
 
     VDisconnectFS();
 
     if (res.hdr.response == SYNC_OK) {
        switch (command) {
        case FSYNC_VOL_STATS_GENERAL:
-           print_vol_stats_general(sres.vol_stats);
-           break;
+           {
+               struct VolPkgStats vol_stats;
+               memcpy(&vol_stats, res_buf, sizeof(vol_stats));
+               print_vol_stats_general(&vol_stats);
+               break;
+           }
        case FSYNC_VOL_STATS_VICEP:
-           print_vol_stats_viceP(sres.vicep_stats);
-           break;
+           {
+               struct DiskPartitionStats64 vicep_stats;
+               memcpy(&vicep_stats, res_buf, sizeof(vicep_stats));
+               print_vol_stats_viceP(&vicep_stats);
+               break;
+           }
        case FSYNC_VOL_STATS_HASH:
-           print_vol_stats_hash(sres.hash_stats);
-           break;
+           {
+               struct VolumeHashChainStats hash_stats;
+               memcpy(&hash_stats, res_buf, sizeof(hash_stats));
+               print_vol_stats_hash(&hash_stats);
+               break;
+           }
 #ifdef AFS_DEMAND_ATTACH_FS
        case FSYNC_VOL_STATS_HDR:
-           print_vol_stats_hdr(sres.hdr_stats);
-           break;
+           {
+               struct volume_hdr_LRU_stats hdr_stats;
+               memcpy(&hdr_stats, res_buf, sizeof(hdr_stats));
+               print_vol_stats_hdr(&hdr_stats);
+               break;
+           }
 #endif /* AFS_DEMAND_ATTACH_FS */
        }
     }
@@ -1216,7 +1186,9 @@ StatsQuery(struct cmd_syndesc * as, void * rock)
 static void
 print_vol_stats_general(VolPkgStats * stats)
 {
+#ifdef AFS_DEMAND_ATTACH_FS
     int i;
+#endif
     afs_uint32 hi, lo;
 
     printf("VolPkgStats = {\n");
@@ -1284,10 +1256,10 @@ static void
 print_vol_stats_viceP(struct DiskPartitionStats64 * stats)
 {
     printf("DiskPartitionStats64 = {\n");
-    printf("\tfree = %lld\n", stats->free);
-    printf("\tminFree = %lld\n", stats->minFree);
-    printf("\ttotalUsable = %lld\n", stats->totalUsable);
-    printf("\tf_files = %lld\n", stats->f_files);
+    printf("\tfree = %" AFS_INT64_FMT "\n", stats->free);
+    printf("\tminFree = %" AFS_INT64_FMT "\n", stats->minFree);
+    printf("\ttotalUsable = %" AFS_INT64_FMT "\n", stats->totalUsable);
+    printf("\tf_files = %" AFS_INT64_FMT "\n", stats->f_files);
 #ifdef AFS_DEMAND_ATTACH_FS
     printf("\tvol_list_len = %d\n", stats->vol_list_len);
 #endif
@@ -1297,7 +1269,9 @@ print_vol_stats_viceP(struct DiskPartitionStats64 * stats)
 static void
 print_vol_stats_hash(struct VolumeHashChainStats * stats)
 {
+#ifdef AFS_DEMAND_ATTACH_FS
     afs_uint32 hi, lo;
+#endif
 
     printf("DiskPartitionStats = {\n");
     printf("\ttable_size = %d\n", stats->table_size);
@@ -1342,3 +1316,171 @@ print_vol_stats_hdr(struct volume_hdr_LRU_stats * stats)
 }
 #endif /* AFS_DEMAND_ATTACH_FS */
 
+
+/**
+ * query VGC.
+ *
+ * @notes args:
+ *    - CUSTOM_PARMS_OFFSET+0 is partition string
+ *    - CUSTOM_PARMS_OFFSET+1 is volume id
+ *
+ * @return operation status
+ *    @retval 0 success
+ */
+static int
+VGCQuery(struct cmd_syndesc * as, void * rock)
+{
+    afs_int32 code;
+    struct state state;
+    char * partName;
+    VolumeId volid;
+    FSSYNC_VGQry_response_t q_res;
+    SYNC_response res;
+    int i;
+    struct cmd_item *ti;
+
+    if (!(ti = as->parms[CUSTOM_PARMS_OFFSET+0].items)) {      /* -partition */
+       return -1;
+    }
+    partName = ti->data;
+
+    if (!(ti = as->parms[CUSTOM_PARMS_OFFSET+1].items)) {      /* -volumeid */
+       return -1;
+    }
+    volid = atoi(ti->data);
+
+    common_prolog(as, &state);
+
+    fprintf(stderr, "calling FSYNC_VCGQuery\n");
+
+    code = FSYNC_VGCQuery(partName, volid, &q_res, &res);
+
+    debug_response(code, &res);
+
+    if (code == SYNC_OK) {
+       printf("VG = {\n");
+       printf("\trw\t=\t%u\n", q_res.rw);
+       printf("\tchildren\t= (\n");
+       for (i = 0; i < VOL_VG_MAX_VOLS; i++) {
+           if (q_res.children[i]) {
+               printf("\t\t%u\n", q_res.children[i]);
+           }
+       }
+       printf("\t)\n");
+    }
+
+    VDisconnectFS();
+
+    return 0;
+}
+
+static int
+VGCAdd(struct cmd_syndesc * as, void * rock)
+{
+    afs_int32 code;
+    struct state state;
+    char * partName;
+    VolumeId parent, child;
+    struct cmd_item *ti;
+    SYNC_response res;
+
+    if (!(ti = as->parms[CUSTOM_PARMS_OFFSET+0].items)) {      /* -partition */
+       return -1;
+    }
+    partName = ti->data;
+
+    if (!(ti = as->parms[CUSTOM_PARMS_OFFSET+1].items)) {      /* -parent */
+       return -1;
+    }
+    parent = atoi(ti->data);
+
+    if (!(ti = as->parms[CUSTOM_PARMS_OFFSET+2].items)) {      /* -child */
+       return -1;
+    }
+    child = atoi(ti->data);
+
+    common_prolog(as, &state);
+    fprintf(stderr, "calling FSYNC_VCGAdd\n");
+    code = FSYNC_VGCAdd(partName, parent, child, state.reason, &res);
+    debug_response(code, &res);
+
+    VDisconnectFS();
+
+    return 0;
+}
+
+static int
+VGCDel(struct cmd_syndesc * as, void * rock)
+{
+    afs_int32 code;
+    struct state state;
+    char * partName;
+    VolumeId parent, child;
+    struct cmd_item *ti;
+    SYNC_response res;
+
+    if (!(ti = as->parms[CUSTOM_PARMS_OFFSET+0].items)) {      /* -partition */
+       return -1;
+    }
+    partName = ti->data;
+
+    if (!(ti = as->parms[CUSTOM_PARMS_OFFSET+1].items)) {      /* -parent */
+       return -1;
+    }
+    parent = atoi(ti->data);
+
+    if (!(ti = as->parms[CUSTOM_PARMS_OFFSET+2].items)) {      /* -child */
+       return -1;
+    }
+    child = atoi(ti->data);
+
+    state.reason = FSYNC_WHATEVER;
+
+    common_prolog(as, &state);
+    fprintf(stderr, "calling FSYNC_VCGDel\n");
+    code = FSYNC_VGCDel(partName, parent, child, state.reason, &res);
+    debug_response(code, &res);
+
+    VDisconnectFS();
+
+    return 0;
+}
+
+static int
+VGCScan(struct cmd_syndesc * as, void * rock)
+{
+    afs_int32 code;
+    struct state state;
+    char * partName;
+    struct cmd_item *ti;
+
+    if (!(ti = as->parms[CUSTOM_PARMS_OFFSET+0].items)) {      /* -partition */
+       return -1;
+    }
+    partName = ti->data;
+
+    common_prolog(as, &state);
+    fprintf(stderr, "calling FSYNC_VCGScan\n");
+    code = FSYNC_VGCScan(partName, state.reason);
+    debug_response(code, NULL);
+
+    VDisconnectFS();
+
+    return 0;
+}
+
+static int
+VGCScanAll(struct cmd_syndesc * as, void * rock)
+{
+    afs_int32 code;
+    struct state state;
+
+    common_prolog(as, &state);
+    fprintf(stderr, "calling FSYNC_VCGScanAll\n");
+    code = FSYNC_VGCScan(NULL, state.reason);
+    debug_response(code, NULL);
+
+    VDisconnectFS();
+
+    return 0;
+}