#include <lock.h>
#include <afs/stds.h>
+#include <rx/rx_queue.h>
#include <rx/xdr.h>
#include <rx/rx.h>
#include <rx/rx_globals.h>
#define COMMONPARMS cmd_Seek(ts, 12);\
cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name");\
+cmd_AddParmAlias(ts, 12, "-c"); /* original -cell option */ \
cmd_AddParm(ts, "-noauth", CMD_FLAG, CMD_OPTIONAL, "don't authenticate");\
cmd_AddParm(ts, "-localauth",CMD_FLAG,CMD_OPTIONAL,"use server tickets");\
cmd_AddParm(ts, "-verbose", CMD_FLAG, CMD_OPTIONAL, "verbose");\
{
char *buffer = (char *)0;
afs_int32 error = 0;
- int done = 0;
afs_uint32 nbytes;
buffer = malloc(blksize);
return -1;
}
- while (!error && !done) {
+ while (!error) {
#ifndef AFS_NT40_ENV /* NT csn't select on non-socket fd's */
fd_set in;
FD_ZERO(&in);
afs_error_message(error));
break;
}
- if (nbytes == 0) {
- done = 1;
+
+ if (nbytes == 0)
break;
- }
+
if (rx_Write(call, buffer, nbytes) != nbytes) {
error = -1;
break;
ListVLDB(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
- afs_uint32 aserver;
afs_int32 code;
afs_int32 vcode;
struct VldbListByAttributes attributes;
int quiet, sort, lock;
afs_int32 thisindex, nextindex;
- aserver = 0;
apart = 0;
attributes.Mask = 0;
/* Server specified */
if (as->parms[1].items) {
+ afs_uint32 aserver;
+
aserver = GetServer(as->parms[1].items->data);
if (aserver == 0) {
fprintf(STDERR, "vos: server '%s' not found in host table\n",
PrintError("convertROtoRW ", code);
goto error_exit;
}
- entry.serverFlags[roindex] = ITSRWVOL;
+ /* Update the VLDB to match what we did on disk as much as possible. */
+ /* If the converted RO was in the VLDB, make it look like the new RW. */
+ if (roserver) {
+ entry.serverFlags[roindex] = ITSRWVOL;
+ } else {
+ /* Add a new site entry for the newly created RW. It's possible
+ * (but unlikely) that we are already at MAXNSERVERS and that this
+ * new site will invalidate the whole VLDB entry; however,
+ * VLDB_ReplaceEntry will detect this and return VL_BADSERVER,
+ * so we need no extra guard logic here.
+ */
+ afs_int32 newrwindex = entry.nServers;
+ (entry.nServers)++;
+ entry.serverNumber[newrwindex] = server;
+ entry.serverPartition[newrwindex] = partition;
+ entry.serverFlags[newrwindex] = ITSRWVOL;
+ }
entry.flags |= RW_EXISTS;
entry.flags &= ~BACK_EXISTS;
+
+ /* if the old RW was in the VLDB, remove it by decrementing the number */
+ /* of servers, replacing the RW entry with the last entry, and zeroing */
+ /* out the last entry. */
if (rwserver) {
(entry.nServers)--;
if (rwindex != entry.nServers) {
"machine readable format");
COMMONPARMS;
cmd_CreateAlias(ts, "volinfo");
+ cmd_CreateAlias(ts, "e");
ts = cmd_CreateSyntax("setfields", SetFields, NULL,
"change volume info fields");