#include <WINNT/afsevent.h>
#endif
-#include <rx/xdr.h>
+#include <afs/opr.h>
+#include <opr/lock.h>
#include <afs/afsint.h>
#ifndef AFS_NT40_ENV
#include <afs/dir.h>
#include <afs/afsutil.h>
#include <afs/fileutil.h>
+#include <rx/rx_queue.h>
#include "nfs.h"
-#include "lwp.h"
#include "lock.h"
#include "ihandle.h"
#include "vnode.h"
struct volop_state {
- afs_uint32 volume;
+ VolumeId volume;
afs_uint32 vnode;
afs_uint32 unique;
char partName[16];
fssd_argc = argc;
#endif
- ts = cmd_CreateSyntax("online", VolOnline, NULL, "bring a volume online (FSYNC_VOL_ON opcode)");
+ ts = cmd_CreateSyntax("online", VolOnline, NULL, 0, "bring a volume online (FSYNC_VOL_ON opcode)");
VOLOP_PARMS_DECL(ts);
- ts = cmd_CreateSyntax("offline", VolOffline, NULL, "take a volume offline (FSYNC_VOL_OFF opcode)");
+ ts = cmd_CreateSyntax("offline", VolOffline, NULL, 0, "take a volume offline (FSYNC_VOL_OFF opcode)");
VOLOP_PARMS_DECL(ts);
- ts = cmd_CreateSyntax("mode", VolMode, NULL, "change volume attach mode (FSYNC_VOL_NEEDVOLUME opcode)");
+ ts = cmd_CreateSyntax("mode", VolMode, NULL, 0, "change volume attach mode (FSYNC_VOL_NEEDVOLUME opcode)");
VOLOP_PARMS_DECL(ts);
cmd_CreateAlias(ts, "needvolume");
- ts = cmd_CreateSyntax("detach", VolDetach, NULL, "detach a volume (FSYNC_VOL_DONE opcode)");
+ ts = cmd_CreateSyntax("detach", VolDetach, NULL, 0, "detach a volume (FSYNC_VOL_DONE opcode)");
VOLOP_PARMS_DECL(ts);
- ts = cmd_CreateSyntax("callback", VolBreakCBKs, NULL, "break callbacks for volume (FSYNC_VOL_BREAKCBKS opcode)");
+ ts = cmd_CreateSyntax("callback", VolBreakCBKs, NULL, 0, "break callbacks for volume (FSYNC_VOL_BREAKCBKS opcode)");
VOLOP_PARMS_DECL(ts);
cmd_CreateAlias(ts, "cbk");
- ts = cmd_CreateSyntax("move", VolMove, NULL, "set volume moved flag (FSYNC_VOL_MOVE opcode)");
+ ts = cmd_CreateSyntax("move", VolMove, NULL, 0, "set volume moved flag (FSYNC_VOL_MOVE opcode)");
VOLOP_PARMS_DECL(ts);
- ts = cmd_CreateSyntax("list", VolList, NULL, "sync local volume list (FSYNC_VOL_LISTVOLUMES opcode)");
+ ts = cmd_CreateSyntax("list", VolList, NULL, 0, "sync local volume list (FSYNC_VOL_LISTVOLUMES opcode)");
VOLOP_PARMS_DECL(ts);
cmd_CreateAlias(ts, "ls");
- ts = cmd_CreateSyntax("leaveoff", VolLeaveOff, 0, "leave volume offline (FSYNC_VOL_LEAVE_OFF opcode)");
+ ts = cmd_CreateSyntax("leaveoff", VolLeaveOff, 0, 0, "leave volume offline (FSYNC_VOL_LEAVE_OFF opcode)");
VOLOP_PARMS_DECL(ts);
- ts = cmd_CreateSyntax("attach", VolForceAttach, 0, "force full attachment (FSYNC_VOL_ATTACH opcode)");
+ ts = cmd_CreateSyntax("attach", VolForceAttach, 0, 0, "force full attachment (FSYNC_VOL_ATTACH opcode)");
VOLOP_PARMS_DECL(ts);
- ts = cmd_CreateSyntax("error", VolForceError, 0, "force into hard error state (FSYNC_VOL_FORCE_ERROR opcode)");
+ ts = cmd_CreateSyntax("error", VolForceError, 0, 0, "force into hard error state (FSYNC_VOL_FORCE_ERROR opcode)");
VOLOP_PARMS_DECL(ts);
- ts = cmd_CreateSyntax("query", VolQuery, NULL, "get volume structure (FSYNC_VOL_QUERY opcode)");
+ ts = cmd_CreateSyntax("query", VolQuery, NULL, 0, "get volume structure (FSYNC_VOL_QUERY opcode)");
VOLOP_PARMS_DECL(ts);
cmd_CreateAlias(ts, "qry");
- ts = cmd_CreateSyntax("header", VolHdrQuery, NULL, "get volume disk data structure (FSYNC_VOL_QUERY_HDR opcode)");
+ ts = cmd_CreateSyntax("header", VolHdrQuery, NULL, 0, "get volume disk data structure (FSYNC_VOL_QUERY_HDR opcode)");
VOLOP_PARMS_DECL(ts);
cmd_CreateAlias(ts, "hdr");
- ts = cmd_CreateSyntax("volop", VolOpQuery, NULL, "get pending volume operation info (FSYNC_VOL_QUERY_VOP opcode)");
+ ts = cmd_CreateSyntax("volop", VolOpQuery, NULL, 0, "get pending volume operation info (FSYNC_VOL_QUERY_VOP opcode)");
VOLOP_PARMS_DECL(ts);
cmd_CreateAlias(ts, "vop");
- ts = cmd_CreateSyntax("vnode", VnQuery, NULL, "get vnode structure (FSYNC_VOL_QUERY_VNODE opcode)");
+ ts = cmd_CreateSyntax("vnode", VnQuery, NULL, 0, "get vnode structure (FSYNC_VOL_QUERY_VNODE opcode)");
cmd_Seek(ts, CUSTOM_PARMS_OFFSET);
cmd_AddParm(ts, "-volumeid", CMD_SINGLE, 0, "volume id");
cmd_AddParm(ts, "-vnodeid", CMD_SINGLE, 0, "vnode id");
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");
+ ts = cmd_CreateSyntax("stats", StatsQuery, NULL, 0, "see 'stats help' for more information");
cmd_Seek(ts, CUSTOM_PARMS_OFFSET);
cmd_AddParm(ts, "-cmd", CMD_SINGLE, 0, "subcommand");
cmd_AddParm(ts, "-arg1", CMD_SINGLE, CMD_OPTIONAL, "arg1");
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)");
+ ts = cmd_CreateSyntax("vgcquery", VGCQuery, 0, 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)");
+ ts = cmd_CreateSyntax("vgcadd", VGCAdd, 0, 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)");
+ ts = cmd_CreateSyntax("vgcdel", VGCDel, 0, 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,
+ ts = cmd_CreateSyntax("vgcscan", VGCScan, 0, 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,
+ ts = cmd_CreateSyntax("vgcscanall", VGCScanAll, 0, 0,
"start whole-server volume group cache re-scan"
" (FSYNC_VG_SCAN_ALL opcode)");
COMMON_PARMS_DECL(ts);
/* LISTVOLUMES is a no-op; we just want to get the response header flags
* to see if the server reports itself as DAFS or not */
code = FSYNC_VolOp(0, NULL, FSYNC_VOL_LISTVOLUMES, FSYNC_WHATEVER, &res);
+ VDisconnectFS(); /* disconnect before continuing */
if (code) {
/* probably failed to contact the fileserver; later code will provide
* some warning/error indication */
struct cmd_item *ti;
state->vop = (struct volop_state *) calloc(1, sizeof(struct volop_state));
- osi_Assert(state->vop != NULL);
+ opr_Assert(state->vop != NULL);
if ((ti = as->parms[COMMON_VOLOP_PARMS_OFFSET].items)) { /* -volumeid */
state->vop->volume = atoi(ti->data);
common_prolog(as, &state);
common_volop_prolog(as, &state);
- if (state.vop->partName==0 || *(state.vop->partName)==0) {
+ if (*(state.vop->partName)==0) {
fprintf(stderr, "required argument -partition not given\n");
return -1;
}
memcpy(&v, res.payload.buf, sizeof(Volume));
printf("volume = {\n");
- printf("\thashid = %u\n", v.hashid);
+ printf("\thashid = %" AFS_VOLID_FMT "\n", afs_printable_VolumeId_lu(v.hashid));
printf("\theader = %p\n", v.header);
printf("\tdevice = %d\n", v.device);
printf("\tpartition = %p\n", v.partition);
printf("\tlinkHandle = %p\n", v.linkHandle);
printf("\tnextVnodeUnique = %u\n", v.nextVnodeUnique);
printf("\tdiskDataHandle = %p\n", v.diskDataHandle);
- printf("\tvnodeHashOffset = %u\n", v.vnodeHashOffset);
printf("\tshuttingDown = %d\n", v.shuttingDown);
printf("\tgoingOffline = %d\n", v.goingOffline);
printf("\tcacheCheck = %u\n", v.cacheCheck);
printf("\t\tversion = %u\n", v.stamp.version);
printf("\t}\n");
- printf("\tid = %u\n", v.id);
+ printf("\tid = %" AFS_VOLID_FMT "\n", afs_printable_VolumeId_lu(v.id));
printf("\tname = '%s'\n", v.name);
if (v.inUse != 0) {
printf("\tinUse = %d (%s)\n", v.inUse, VPTypeToString(v.inUse));
printf("\tneedsSalvaged = %d\n", v.needsSalvaged);
printf("\tuniquifier = %u\n", v.uniquifier);
printf("\ttype = %d\n", v.type);
- printf("\tparentId = %u\n", v.parentId);
- printf("\tcloneId = %u\n", v.cloneId);
- printf("\tbackupId = %u\n", v.backupId);
- printf("\trestoredFromId = %u\n", v.restoredFromId);
+ printf("\tparentId = %" AFS_VOLID_FMT "\n", afs_printable_VolumeId_lu(v.parentId));
+ printf("\tcloneId = %" AFS_VOLID_FMT "\n", afs_printable_VolumeId_lu(v.cloneId));
+ printf("\tbackupId = %" AFS_VOLID_FMT "\n", afs_printable_VolumeId_lu(v.backupId));
+ printf("\trestoredFromId = %" AFS_VOLID_FMT "\n", afs_printable_VolumeId_lu(v.restoredFromId));
printf("\tneedsCallback = %d\n", v.needsCallback);
printf("\tdestroyMe = %d\n", v.destroyMe);
printf("\tdontSalvage = %d\n", v.dontSalvage);
printf("\texpirationDate = %u\n", v.expirationDate);
printf("\tbackupDate = %u\n", v.backupDate);
printf("\tcopyDate = %u\n", v.copyDate);
-#ifdef OPENAFS_VOL_STATS
printf("\tstat_initialized = %d\n", v.stat_initialized);
-#else
- printf("\tmtd = '%s'\n", v.motd);
-#endif
printf("}\n");
}
printf("\t}\n");
printf("\tvop = {\n");
- printf("\t\tvolume = %u\n", vop.vop.volume);
+ printf("\t\tvolume = %" AFS_VOLID_FMT "\n", afs_printable_VolumeId_lu(vop.vop.volume));
if (strnlen(vop.vop.partName, sizeof(vop.vop.partName)) <
sizeof(vop.vop.partName)) {
printf("\t\tpartName = '%s'\n", vop.vop.partName);
git://git.openafs.org / openafs.git / blobdiff