#include <afsconfig.h>
#include <afs/param.h>
-RCSID("$Header$");
+RCSID
+ ("$Header$");
#include <sys/types.h>
#include <ctype.h>
struct rx_call *call; /* call to which to write, might be an array */
int device; /* dump device ID for volume */
int parentId; /* dump parent ID for volume */
- struct DiskPartition *dumpPartition; /* Dump partition. */
- struct rx_call **calls; /* array of pointers to calls */
- int ncalls; /* how many calls/codes in array */
- int *codes; /* one return code for each call */
+ struct DiskPartition *dumpPartition; /* Dump partition. */
+ struct rx_call **calls; /* array of pointers to calls */
+ int ncalls; /* how many calls/codes in array */
+ int *codes; /* one return code for each call */
char haveOldChar; /* state for pushing back a character */
char oldChar;
};
/* Forward Declarations */
-static int DumpDumpHeader(register struct iod *iodp, register Volume *vp,
+static int DumpDumpHeader(register struct iod *iodp, register Volume * vp,
afs_int32 fromtime);
-static int DumpPartial(register struct iod *iodp, register Volume *vp,
+static int DumpPartial(register struct iod *iodp, register Volume * vp,
afs_int32 fromtime, int dumpAllDirs);
-static int DumpVnodeIndex(register struct iod *iodp, Volume *vp,
- VnodeClass class, afs_int32 fromtime, int forcedump);
+static int DumpVnodeIndex(register struct iod *iodp, Volume * vp,
+ VnodeClass class, afs_int32 fromtime,
+ int forcedump);
static int DumpVnode(register struct iod *iodp, struct VnodeDiskObject *v,
int volid, int vnodeNumber, int dumpEverything);
static int ReadDumpHeader(register struct iod *iodp, struct DumpHeader *hp);
-static int ReadVnodes(register struct iod *iodp, Volume *vp,
- int incremental, afs_int32 *Lbuf, afs_int32 s1,
- afs_int32 *Sbuf, afs_int32 s2, afs_int32 delo);
-static bit32 volser_WriteFile(int vn, struct iod *iodp, FdHandle_t *handleP,
- Error *status);
-
-static int SizeDumpDumpHeader(register struct iod *iodp, register Volume *vp,
- afs_int32 fromtime, register struct volintSize *size);
-static int SizeDumpPartial(register struct iod *iodp, register Volume *vp,
+static int ReadVnodes(register struct iod *iodp, Volume * vp, int incremental,
+ afs_int32 * Lbuf, afs_int32 s1, afs_int32 * Sbuf,
+ afs_int32 s2, afs_int32 delo);
+static bit32 volser_WriteFile(int vn, struct iod *iodp, FdHandle_t * handleP,
+ Error * status);
+
+static int SizeDumpDumpHeader(register struct iod *iodp, register Volume * vp,
+ afs_int32 fromtime,
+ register struct volintSize *size);
+static int SizeDumpPartial(register struct iod *iodp, register Volume * vp,
afs_int32 fromtime, int dumpAllDirs,
register struct volintSize *size);
-static int SizeDumpVnodeIndex(register struct iod *iodp, Volume *vp,
- VnodeClass class, afs_int32 fromtime, int forcedump,
+static int SizeDumpVnodeIndex(register struct iod *iodp, Volume * vp,
+ VnodeClass class, afs_int32 fromtime,
+ int forcedump,
register struct volintSize *size);
static int SizeDumpVnode(register struct iod *iodp, struct VnodeDiskObject *v,
int volid, int vnodeNumber, int dumpEverything,
register struct volintSize *size);
-static void iod_Init(register struct iod *iodp, register struct rx_call *call)
+static void
+iod_Init(register struct iod *iodp, register struct rx_call *call)
{
iodp->call = call;
iodp->haveOldChar = 0;
iodp->ncalls = 1;
- iodp->calls = (struct rx_call **) 0;
+ iodp->calls = (struct rx_call **)0;
}
-static void iod_InitMulti(struct iod *iodp, struct rx_call **calls, int ncalls,
- int *codes)
+static void
+iod_InitMulti(struct iod *iodp, struct rx_call **calls, int ncalls,
+ int *codes)
{
- iodp->calls = calls;
- iodp->haveOldChar = 0;
- iodp->ncalls = ncalls;
- iodp->codes = codes;
- iodp->call = (struct rx_call *) 0;
+ iodp->calls = calls;
+ iodp->haveOldChar = 0;
+ iodp->ncalls = ncalls;
+ iodp->codes = codes;
+ iodp->call = (struct rx_call *)0;
}
/* N.B. iod_Read doesn't check for oldchar (see previous comment) */
* I don't think we want half the replicas to go bad just because one
* connection timed out, but if they all time out, then we should give up.
*/
-static int iod_Write(struct iod *iodp, char *buf, int nbytes)
+static int
+iod_Write(struct iod *iodp, char *buf, int nbytes)
{
- int code, i;
- int one_success = 0;
-
- assert ((iodp->call && iodp->ncalls == 1 && !iodp->calls) ||
- (!iodp->call && iodp->ncalls >= 1 && iodp->calls));
-
- if (iodp->call) {
- code = rx_Write(iodp->call, buf, nbytes);
- return code;
- }
-
- for (i=0; i < iodp->ncalls; i++) {
- if (iodp->calls[i] && !iodp->codes[i]) {
- code = rx_Write(iodp->calls[i], buf, nbytes);
- if (code != nbytes) { /* everything gets merged into a single error */
- iodp->codes[i] = VOLSERDUMPERROR; /* but that's exactly what the */
- } /* standard dump does, anyways */
- else {
- one_success = TRUE;
- }
+ int code, i;
+ int one_success = 0;
+
+ assert((iodp->call && iodp->ncalls == 1 && !iodp->calls)
+ || (!iodp->call && iodp->ncalls >= 1 && iodp->calls));
+
+ if (iodp->call) {
+ code = rx_Write(iodp->call, buf, nbytes);
+ return code;
}
- } /* for all calls */
-if (one_success)
- return nbytes;
-else return 0;
+ for (i = 0; i < iodp->ncalls; i++) {
+ if (iodp->calls[i] && !iodp->codes[i]) {
+ code = rx_Write(iodp->calls[i], buf, nbytes);
+ if (code != nbytes) { /* everything gets merged into a single error */
+ iodp->codes[i] = VOLSERDUMPERROR; /* but that's exactly what the */
+ } /* standard dump does, anyways */
+ else {
+ one_success = TRUE;
+ }
+ }
+ } /* for all calls */
+
+ if (one_success)
+ return nbytes;
+ else
+ return 0;
}
-static void iod_ungetc(struct iod *iodp, int achar)
+static void
+iod_ungetc(struct iod *iodp, int achar)
{
iodp->oldChar = achar;
iodp->haveOldChar = 1;
}
-static int iod_getc(register struct iod *iodp)
+static int
+iod_getc(register struct iod *iodp)
{
unsigned char t;
-
+
if (iodp->haveOldChar) {
iodp->haveOldChar = 0;
return iodp->oldChar;
}
- if (iod_Read(iodp, &t, 1) == 1) return t;
+ if (iod_Read(iodp, &t, 1) == 1)
+ return t;
return EOF;
}
-static int ReadShort(register struct iod *iodp, register unsigned short *sp)
+static int
+ReadShort(register struct iod *iodp, register unsigned short *sp)
{
- register b1,b0;
+ register b1, b0;
b1 = iod_getc(iodp);
b0 = iod_getc(iodp);
- *sp = (b1<<8) | b0;
+ *sp = (b1 << 8) | b0;
return b0 != EOF;
}
-static int ReadInt32(register struct iod *iodp, afs_uint32 *lp)
+static int
+ReadInt32(register struct iod *iodp, afs_uint32 * lp)
{
- afs_uint32 register b3,b2,b1,b0;
+ afs_uint32 register b3, b2, b1, b0;
b3 = iod_getc(iodp);
b2 = iod_getc(iodp);
b1 = iod_getc(iodp);
b0 = iod_getc(iodp);
- *lp = (((((b3<<8)|b2)<<8)|b1)<<8)|b0;
+ *lp = (((((b3 << 8) | b2) << 8) | b1) << 8) | b0;
return b0 != EOF;
}
-static void ReadString(register struct iod *iodp, register char *to,
- register int maxa)
+static void
+ReadString(register struct iod *iodp, register char *to, register int maxa)
{
register int c;
while (maxa--) {
}
}
-static void ReadByteString(register struct iod *iodp, register byte *to,
- register int size)
+static void
+ReadByteString(register struct iod *iodp, register byte * to,
+ register int size)
{
while (size--)
*to++ = iod_getc(iodp);
}
-static int ReadVolumeHeader(register struct iod *iodp, VolumeDiskData *vol)
+static int
+ReadVolumeHeader(register struct iod *iodp, VolumeDiskData * vol)
{
register tag;
afs_uint32 trash;
memset(vol, 0, sizeof(*vol));
while ((tag = iod_getc(iodp)) > D_MAX && tag != EOF) {
switch (tag) {
- case 'i':
- if(!ReadInt32(iodp, &vol->id)) return VOLSERREAD_DUMPERROR;
- break;
- case 'v':
- if(!ReadInt32(iodp, &trash)) return VOLSERREAD_DUMPERROR;
- break;
- case 'n':
- ReadString(iodp, vol->name, sizeof(vol->name));
- /*this means the name of the retsored volume could be possibly different. In conjunction with SAFSVolSignalRestore */
- break;
- case 's':
- vol->inService = iod_getc(iodp );
- break;
- case 'b':
- vol->blessed = iod_getc(iodp );
- break;
- case 'u':
- if(!ReadInt32(iodp, &vol->uniquifier)) return VOLSERREAD_DUMPERROR;
- break;
- case 't':
- vol->type = iod_getc(iodp );
- break;
- case 'p':
- if(!ReadInt32(iodp, &vol->parentId)) return VOLSERREAD_DUMPERROR;
- break;
- case 'c':
- if(!ReadInt32(iodp, &vol->cloneId)) return VOLSERREAD_DUMPERROR;
- break;
- case 'q':
- if(!ReadInt32(iodp, (afs_uint32 *)&vol->maxquota)) return VOLSERREAD_DUMPERROR;
- break;
- case 'm':
- if(!ReadInt32(iodp, (afs_uint32 *)&vol->minquota)) return VOLSERREAD_DUMPERROR;
- break;
- case 'd':
- if(!ReadInt32(iodp, (afs_uint32 *)&vol->diskused)) return VOLSERREAD_DUMPERROR; /* Bogus: should calculate this */
- break;
- case 'f':
- if(!ReadInt32(iodp, (afs_uint32 *)&vol->filecount)) return VOLSERREAD_DUMPERROR;
- break;
- case 'a':
- if(!ReadInt32(iodp, &vol->accountNumber)) return VOLSERREAD_DUMPERROR;
- break;
- case 'o':
- if(!ReadInt32(iodp, &vol->owner)) return VOLSERREAD_DUMPERROR;
- break;
- case 'C':
- if(!ReadInt32(iodp, &vol->creationDate)) return VOLSERREAD_DUMPERROR;
- break;
- case 'A':
- if(!ReadInt32(iodp, &vol->accessDate)) return VOLSERREAD_DUMPERROR;
- break;
- case 'U':
- if(!ReadInt32(iodp, &vol->updateDate)) return VOLSERREAD_DUMPERROR;
- break;
- case 'E':
- if(!ReadInt32(iodp, &vol->expirationDate)) return VOLSERREAD_DUMPERROR;
- break;
- case 'B':
- if(!ReadInt32(iodp, &vol->backupDate)) return VOLSERREAD_DUMPERROR;
- break;
- case 'O':
- ReadString(iodp, vol->offlineMessage, sizeof(vol->offlineMessage));
- break;
- case 'M':
- /*
- * Detailed volume statistics are never stored in dumps,
- * so we just restore either the null string if this volume
- * had already been set to store statistics, or the old motd
- * contents otherwise. It doesn't matter, since this field
- * will soon get initialized anyway.
- */
- ReadString(iodp, (char *)(vol->stat_reads), VMSGSIZE);
- break;
- case 'W': {
+ case 'i':
+ if (!ReadInt32(iodp, &vol->id))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'v':
+ if (!ReadInt32(iodp, &trash))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'n':
+ ReadString(iodp, vol->name, sizeof(vol->name));
+ /*this means the name of the retsored volume could be possibly different. In conjunction with SAFSVolSignalRestore */
+ break;
+ case 's':
+ vol->inService = iod_getc(iodp);
+ break;
+ case 'b':
+ vol->blessed = iod_getc(iodp);
+ break;
+ case 'u':
+ if (!ReadInt32(iodp, &vol->uniquifier))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 't':
+ vol->type = iod_getc(iodp);
+ break;
+ case 'p':
+ if (!ReadInt32(iodp, &vol->parentId))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'c':
+ if (!ReadInt32(iodp, &vol->cloneId))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'q':
+ if (!ReadInt32(iodp, (afs_uint32 *) & vol->maxquota))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'm':
+ if (!ReadInt32(iodp, (afs_uint32 *) & vol->minquota))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'd':
+ if (!ReadInt32(iodp, (afs_uint32 *) & vol->diskused))
+ return VOLSERREAD_DUMPERROR; /* Bogus: should calculate this */
+ break;
+ case 'f':
+ if (!ReadInt32(iodp, (afs_uint32 *) & vol->filecount))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'a':
+ if (!ReadInt32(iodp, &vol->accountNumber))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'o':
+ if (!ReadInt32(iodp, &vol->owner))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'C':
+ if (!ReadInt32(iodp, &vol->creationDate))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'A':
+ if (!ReadInt32(iodp, &vol->accessDate))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'U':
+ if (!ReadInt32(iodp, &vol->updateDate))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'E':
+ if (!ReadInt32(iodp, &vol->expirationDate))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'B':
+ if (!ReadInt32(iodp, &vol->backupDate))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'O':
+ ReadString(iodp, vol->offlineMessage,
+ sizeof(vol->offlineMessage));
+ break;
+ case 'M':
+ /*
+ * Detailed volume statistics are never stored in dumps,
+ * so we just restore either the null string if this volume
+ * had already been set to store statistics, or the old motd
+ * contents otherwise. It doesn't matter, since this field
+ * will soon get initialized anyway.
+ */
+ ReadString(iodp, (char *)(vol->stat_reads), VMSGSIZE);
+ break;
+ case 'W':{
unsigned short length;
int i;
- afs_uint32 data;
- if(!ReadShort(iodp, &length)) return VOLSERREAD_DUMPERROR;
- for (i = 0; i<length; i++) {
- if(!ReadInt32(iodp, &data)) return VOLSERREAD_DUMPERROR;
- if (i < sizeof(vol->weekUse)/sizeof(vol->weekUse[0]))
+ afs_uint32 data;
+ if (!ReadShort(iodp, &length))
+ return VOLSERREAD_DUMPERROR;
+ for (i = 0; i < length; i++) {
+ if (!ReadInt32(iodp, &data))
+ return VOLSERREAD_DUMPERROR;
+ if (i < sizeof(vol->weekUse) / sizeof(vol->weekUse[0]))
vol->weekUse[i] = data;
}
break;
}
- case 'D':
- if(!ReadInt32(iodp, &vol->dayUseDate)) return VOLSERREAD_DUMPERROR;
- break;
- case 'Z':
- if(!ReadInt32(iodp, (afs_uint32 *)&vol->dayUse)) return VOLSERREAD_DUMPERROR;
- break;
+ case 'D':
+ if (!ReadInt32(iodp, &vol->dayUseDate))
+ return VOLSERREAD_DUMPERROR;
+ break;
+ case 'Z':
+ if (!ReadInt32(iodp, (afs_uint32 *) & vol->dayUse))
+ return VOLSERREAD_DUMPERROR;
+ break;
}
}
iod_ungetc(iodp, tag);
return 0;
}
-static int DumpTag(register struct iod *iodp, register int tag)
+static int
+DumpTag(register struct iod *iodp, register int tag)
{
char p;
-
+
p = tag;
- return((iod_Write(iodp, &p, 1) == 1)? 0 : VOLSERDUMPERROR);
-
+ return ((iod_Write(iodp, &p, 1) == 1) ? 0 : VOLSERDUMPERROR);
+
}
-static int DumpByte(register struct iod *iodp, char tag, byte value)
+static int
+DumpByte(register struct iod *iodp, char tag, byte value)
{
char tbuffer[2];
- register byte *p = (unsigned char *) tbuffer;
+ register byte *p = (unsigned char *)tbuffer;
*p++ = tag;
*p = value;
- return((iod_Write(iodp, tbuffer, 2) == 2)? 0: VOLSERDUMPERROR);
+ return ((iod_Write(iodp, tbuffer, 2) == 2) ? 0 : VOLSERDUMPERROR);
}
#define putint32(p, v) *p++ = v>>24, *p++ = v>>16, *p++ = v>>8, *p++ = v
#define putshort(p, v) *p++ = v>>8, *p++ = v
-static int DumpDouble(register struct iod *iodp, char tag,
- register afs_uint32 value1, register afs_uint32 value2)
+static int
+DumpDouble(register struct iod *iodp, char tag, register afs_uint32 value1,
+ register afs_uint32 value2)
{
char tbuffer[9];
- register byte *p = (unsigned char *) tbuffer;
+ register byte *p = (unsigned char *)tbuffer;
*p++ = tag;
putint32(p, value1);
putint32(p, value2);
- return((iod_Write(iodp, tbuffer, 9) == 9)? 0: VOLSERDUMPERROR);
+ return ((iod_Write(iodp, tbuffer, 9) == 9) ? 0 : VOLSERDUMPERROR);
}
-static int DumpInt32(register struct iod *iodp, char tag,
- register afs_uint32 value)
+static int
+DumpInt32(register struct iod *iodp, char tag, register afs_uint32 value)
{
char tbuffer[5];
- register byte *p = (unsigned char *) tbuffer;
+ register byte *p = (unsigned char *)tbuffer;
*p++ = tag;
putint32(p, value);
- return((iod_Write(iodp, tbuffer, 5) == 5)? 0: VOLSERDUMPERROR);
+ return ((iod_Write(iodp, tbuffer, 5) == 5) ? 0 : VOLSERDUMPERROR);
}
-static int DumpArrayInt32(register struct iod *iodp, char tag,
- register afs_uint32 *array, register int nelem)
+static int
+DumpArrayInt32(register struct iod *iodp, char tag,
+ register afs_uint32 * array, register int nelem)
{
char tbuffer[4];
- register afs_uint32 v ;
+ register afs_uint32 v;
int code = 0;
- register byte *p = (unsigned char *) tbuffer;
+ register byte *p = (unsigned char *)tbuffer;
*p++ = tag;
putshort(p, nelem);
code = iod_Write(iodp, tbuffer, 3);
- if (code != 3) return VOLSERDUMPERROR;
+ if (code != 3)
+ return VOLSERDUMPERROR;
while (nelem--) {
- p = (unsigned char *) tbuffer;
- v = *array++;/*this was register */
-
+ p = (unsigned char *)tbuffer;
+ v = *array++; /*this was register */
+
putint32(p, v);
code = iod_Write(iodp, tbuffer, 4);
- if(code != 4) return VOLSERDUMPERROR;
+ if (code != 4)
+ return VOLSERDUMPERROR;
}
return 0;
}
-static int DumpShort(register struct iod *iodp, char tag, unsigned int value)
+static int
+DumpShort(register struct iod *iodp, char tag, unsigned int value)
{
char tbuffer[3];
- register byte *p = (unsigned char *) tbuffer;
+ register byte *p = (unsigned char *)tbuffer;
*p++ = tag;
- *p++ = value>>8;
+ *p++ = value >> 8;
*p = value;
- return((iod_Write(iodp, tbuffer, 3) == 3)? 0: VOLSERDUMPERROR);
+ return ((iod_Write(iodp, tbuffer, 3) == 3) ? 0 : VOLSERDUMPERROR);
}
-static int DumpBool(register struct iod *iodp, char tag, unsigned int value)
+static int
+DumpBool(register struct iod *iodp, char tag, unsigned int value)
{
char tbuffer[2];
- register byte *p = (unsigned char *) tbuffer;
+ register byte *p = (unsigned char *)tbuffer;
*p++ = tag;
*p = value;
- return((iod_Write(iodp, tbuffer, 2) == 2)? 0: VOLSERDUMPERROR);
+ return ((iod_Write(iodp, tbuffer, 2) == 2) ? 0 : VOLSERDUMPERROR);
}
-static int DumpString(register struct iod *iodp, char tag, register char *s)
+static int
+DumpString(register struct iod *iodp, char tag, register char *s)
{
register n;
int code = 0;
code = iod_Write(iodp, &tag, 1);
- if(code != 1) return VOLSERDUMPERROR;
- n = strlen(s)+1;
+ if (code != 1)
+ return VOLSERDUMPERROR;
+ n = strlen(s) + 1;
code = iod_Write(iodp, s, n);
- if(code != n) return VOLSERDUMPERROR;
+ if (code != n)
+ return VOLSERDUMPERROR;
return 0;
}
-static int DumpByteString(register struct iod *iodp, char tag,
- register byte *bs, register int nbytes)
+static int
+DumpByteString(register struct iod *iodp, char tag, register byte * bs,
+ register int nbytes)
{
int code = 0;
code = iod_Write(iodp, &tag, 1);
- if(code != 1) return VOLSERDUMPERROR;
+ if (code != 1)
+ return VOLSERDUMPERROR;
code = iod_Write(iodp, (char *)bs, nbytes);
- if(code != nbytes) return VOLSERDUMPERROR;
+ if (code != nbytes)
+ return VOLSERDUMPERROR;
return 0;
}
-
-static int DumpFile(struct iod *iodp, char tag, int vnode, FdHandle_t *handleP)
+
+static int
+DumpFile(struct iod *iodp, char tag, int vnode, FdHandle_t * handleP)
{
- int code = 0, lcode = 0, error = 0;
+ int code = 0, lcode = 0, error = 0;
afs_int32 pad = 0, offset;
- int n, nbytes, howMany, howBig;
- byte *p;
+ int n, nbytes, howMany, howBig;
+ byte *p;
struct stat status;
int size;
#ifdef AFS_AIX_ENV
size = FDH_SIZE(handleP);
code = DumpInt32(iodp, tag, size);
if (code) {
- return VOLSERDUMPERROR;
+ return VOLSERDUMPERROR;
}
- p = (unsigned char *) malloc(howMany);
+ p = (unsigned char *)malloc(howMany);
if (!p) {
- Log("1 Volser: DumpFile: no memory");
- return VOLSERDUMPERROR;
+ Log("1 Volser: DumpFile: no memory");
+ return VOLSERDUMPERROR;
}
for (nbytes = size; (nbytes && !error); nbytes -= howMany) {
- if (nbytes < howMany)
- howMany = nbytes;
+ if (nbytes < howMany)
+ howMany = nbytes;
/* Read the data - unless we know we can't */
- n = (lcode ? 0 : FDH_READ(handleP, p, howMany));
+ n = (lcode ? 0 : FDH_READ(handleP, p, howMany));
/* If read any good data and we null padded previously, log the
* amount that we had null padded.
*/
if ((n > 0) && pad) {
- Log("1 Volser: DumpFile: Null padding file %d bytes at offset %u\n",
- pad, offset);
- pad = 0;
+ Log("1 Volser: DumpFile: Null padding file %d bytes at offset %u\n", pad, offset);
+ pad = 0;
}
/* If didn't read enough data, null padd the rest of the buffer. This
* want to quit the dump, so we start null padding.
*/
if (n < howMany) {
- /* Record the read error */
- if (n < 0) {
- n = 0;
- Log("1 Volser: DumpFile: Error %d reading inode %s for vnode %d\n",
- errno, PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
- }
- else if (!pad) {
- Log("1 Volser: DumpFile: Error reading inode %s for vnode %d\n",
- PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
- }
-
- /* Pad the rest of the buffer with zeros. Remember offset we started
- * padding. Keep total tally of padding.
- */
- memset(p+n, 0, howMany-n);
- if (!pad)
- offset = (howBig - nbytes) + n;
- pad += (howMany-n);
-
- /* Now seek over the data we could not get. An error here means we
- * can't do the next read.
- */
- lcode = FDH_SEEK(handleP, ((size - nbytes) + howMany), SEEK_SET);
- if (lcode != ((size - nbytes) + howMany)) {
- if (lcode < 0) {
- Log("1 Volser: DumpFile: Error %d seeking in inode %s for vnode %d\n",
- errno, PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
- }
- else {
- Log("1 Volser: DumpFile: Error seeking in inode %s for vnode %d\n",
- PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
- lcode = -1;
- }
- }
- else {
- lcode = 0;
- }
+ /* Record the read error */
+ if (n < 0) {
+ n = 0;
+ Log("1 Volser: DumpFile: Error %d reading inode %s for vnode %d\n", errno, PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
+ } else if (!pad) {
+ Log("1 Volser: DumpFile: Error reading inode %s for vnode %d\n", PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
+ }
+
+ /* Pad the rest of the buffer with zeros. Remember offset we started
+ * padding. Keep total tally of padding.
+ */
+ memset(p + n, 0, howMany - n);
+ if (!pad)
+ offset = (howBig - nbytes) + n;
+ pad += (howMany - n);
+
+ /* Now seek over the data we could not get. An error here means we
+ * can't do the next read.
+ */
+ lcode = FDH_SEEK(handleP, ((size - nbytes) + howMany), SEEK_SET);
+ if (lcode != ((size - nbytes) + howMany)) {
+ if (lcode < 0) {
+ Log("1 Volser: DumpFile: Error %d seeking in inode %s for vnode %d\n", errno, PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
+ } else {
+ Log("1 Volser: DumpFile: Error seeking in inode %s for vnode %d\n", PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
+ lcode = -1;
+ }
+ } else {
+ lcode = 0;
+ }
}
/* Now write the data out */
- if (iod_Write(iodp, (char *)p, howMany) != howMany)
- error = VOLSERDUMPERROR;
+ if (iod_Write(iodp, (char *)p, howMany) != howMany)
+ error = VOLSERDUMPERROR;
IOMGR_Poll();
}
- if (pad) { /* Any padding we hadn't reported yet */
- Log("1 Volser: DumpFile: Null padding file: %d bytes at offset %u\n",
- pad, offset);
+ if (pad) { /* Any padding we hadn't reported yet */
+ Log("1 Volser: DumpFile: Null padding file: %d bytes at offset %u\n",
+ pad, offset);
}
free(p);
return error;
}
-static int DumpVolumeHeader(register struct iod *iodp, register Volume *vp)
+static int
+DumpVolumeHeader(register struct iod *iodp, register Volume * vp)
{
int code = 0;
- static char nullString[1] = ""; /*The ``contents'' of motd*/
-
- if (!code) code = DumpTag(iodp, D_VOLUMEHEADER);
- if (!code) {code = DumpInt32(iodp, 'i',V_id(vp));}
- if (!code) code = DumpInt32(iodp, 'v',V_stamp(vp).version);
- if (!code) code = DumpString(iodp, 'n',V_name(vp));
- if (!code) code = DumpBool(iodp, 's',V_inService(vp));
- if (!code) code = DumpBool(iodp, 'b',V_blessed(vp));
- if (!code) code = DumpInt32(iodp, 'u',V_uniquifier(vp));
- if (!code) code = DumpByte(iodp, 't',(byte)V_type(vp));
- if (!code){ code = DumpInt32(iodp, 'p',V_parentId(vp));}
- if (!code) code = DumpInt32(iodp, 'c',V_cloneId(vp));
- if (!code) code = DumpInt32(iodp, 'q',V_maxquota(vp));
- if (!code) code = DumpInt32(iodp, 'm',V_minquota(vp));
- if (!code) code = DumpInt32(iodp, 'd',V_diskused(vp));
- if (!code) code = DumpInt32(iodp, 'f',V_filecount(vp));
- if (!code) code = DumpInt32(iodp, 'a', V_accountNumber(vp));
- if (!code) code = DumpInt32(iodp, 'o', V_owner(vp));
- if (!code) code = DumpInt32(iodp, 'C',V_creationDate(vp)); /* Rw volume creation date */
- if (!code) code = DumpInt32(iodp, 'A',V_accessDate(vp));
- if (!code) code = DumpInt32(iodp, 'U',V_updateDate(vp));
- if (!code) code = DumpInt32(iodp, 'E',V_expirationDate(vp));
- if (!code) code = DumpInt32(iodp, 'B',V_backupDate(vp)); /* Rw volume backup clone date */
- if (!code) code = DumpString(iodp, 'O',V_offlineMessage(vp));
+ static char nullString[1] = ""; /*The ``contents'' of motd */
+
+ if (!code)
+ code = DumpTag(iodp, D_VOLUMEHEADER);
+ if (!code) {
+ code = DumpInt32(iodp, 'i', V_id(vp));
+ }
+ if (!code)
+ code = DumpInt32(iodp, 'v', V_stamp(vp).version);
+ if (!code)
+ code = DumpString(iodp, 'n', V_name(vp));
+ if (!code)
+ code = DumpBool(iodp, 's', V_inService(vp));
+ if (!code)
+ code = DumpBool(iodp, 'b', V_blessed(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'u', V_uniquifier(vp));
+ if (!code)
+ code = DumpByte(iodp, 't', (byte) V_type(vp));
+ if (!code) {
+ code = DumpInt32(iodp, 'p', V_parentId(vp));
+ }
+ if (!code)
+ code = DumpInt32(iodp, 'c', V_cloneId(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'q', V_maxquota(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'm', V_minquota(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'd', V_diskused(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'f', V_filecount(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'a', V_accountNumber(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'o', V_owner(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'C', V_creationDate(vp)); /* Rw volume creation date */
+ if (!code)
+ code = DumpInt32(iodp, 'A', V_accessDate(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'U', V_updateDate(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'E', V_expirationDate(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'B', V_backupDate(vp)); /* Rw volume backup clone date */
+ if (!code)
+ code = DumpString(iodp, 'O', V_offlineMessage(vp));
/*
* We do NOT dump the detailed volume statistics residing in the old
* motd field, since we cannot tell from the info in a dump whether
* statistics data has been put there. Instead, we dump a null string,
* just as if that was what the motd contained.
*/
- if (!code) code = DumpString(iodp, 'M', nullString);
- if (!code) code = DumpArrayInt32(iodp, 'W', (afs_uint32 *)V_weekUse(vp), sizeof(V_weekUse(vp))/sizeof(V_weekUse(vp)[0]));
- if (!code) code = DumpInt32(iodp, 'D', V_dayUseDate(vp));
- if (!code) code = DumpInt32(iodp, 'Z', V_dayUse(vp));
+ if (!code)
+ code = DumpString(iodp, 'M', nullString);
+ if (!code)
+ code =
+ DumpArrayInt32(iodp, 'W', (afs_uint32 *) V_weekUse(vp),
+ sizeof(V_weekUse(vp)) / sizeof(V_weekUse(vp)[0]));
+ if (!code)
+ code = DumpInt32(iodp, 'D', V_dayUseDate(vp));
+ if (!code)
+ code = DumpInt32(iodp, 'Z', V_dayUse(vp));
return code;
}
-static int DumpEnd(register struct iod *iodp)
+static int
+DumpEnd(register struct iod *iodp)
{
- return(DumpInt32(iodp, D_DUMPEND, DUMPENDMAGIC));
+ return (DumpInt32(iodp, D_DUMPEND, DUMPENDMAGIC));
}
/* Guts of the dump code */
/* Dump a whole volume */
-int DumpVolume(register struct rx_call *call, register Volume *vp,
- afs_int32 fromtime, int dumpAllDirs)
+int
+DumpVolume(register struct rx_call *call, register Volume * vp,
+ afs_int32 fromtime, int dumpAllDirs)
{
struct iod iod;
int code = 0;
register struct iod *iodp = &iod;
iod_Init(iodp, call);
-
- if (!code) code = DumpDumpHeader(iodp, vp, fromtime);
-
- if (!code) code = DumpPartial(iodp, vp, fromtime, dumpAllDirs);
-
+
+ if (!code)
+ code = DumpDumpHeader(iodp, vp, fromtime);
+
+ if (!code)
+ code = DumpPartial(iodp, vp, fromtime, dumpAllDirs);
+
/* hack follows. Errors should be handled quite differently in this version of dump than they used to be.*/
if (rx_Error(iodp->call)) {
- Log("1 Volser: DumpVolume: Rx call failed during dump, error %d\n", rx_Error(iodp->call));
+ Log("1 Volser: DumpVolume: Rx call failed during dump, error %d\n",
+ rx_Error(iodp->call));
return VOLSERDUMPERROR;
}
- if (!code) code = DumpEnd(iodp);
-
+ if (!code)
+ code = DumpEnd(iodp);
+
return code;
}
/* Dump a volume to multiple places*/
-int DumpVolMulti(struct rx_call **calls, int ncalls, Volume *vp,
- afs_int32 fromtime, int dumpAllDirs, int *codes)
+int
+DumpVolMulti(struct rx_call **calls, int ncalls, Volume * vp,
+ afs_int32 fromtime, int dumpAllDirs, int *codes)
{
struct iod iod;
int code = 0;
iod_InitMulti(&iod, calls, ncalls, codes);
-
- if (!code) code = DumpDumpHeader(&iod, vp, fromtime);
- if (!code) code = DumpPartial(&iod, vp, fromtime, dumpAllDirs);
- if (!code) code = DumpEnd(&iod);
+
+ if (!code)
+ code = DumpDumpHeader(&iod, vp, fromtime);
+ if (!code)
+ code = DumpPartial(&iod, vp, fromtime, dumpAllDirs);
+ if (!code)
+ code = DumpEnd(&iod);
return code;
}
/* A partial dump (no dump header) */
-static int DumpPartial(register struct iod *iodp, register Volume *vp,
- afs_int32 fromtime, int dumpAllDirs)
+static int
+DumpPartial(register struct iod *iodp, register Volume * vp,
+ afs_int32 fromtime, int dumpAllDirs)
{
int code = 0;
- if (!code) code = DumpVolumeHeader(iodp, vp);
- if (!code) code = DumpVnodeIndex(iodp, vp, vLarge, fromtime, dumpAllDirs);
- if (!code) code = DumpVnodeIndex(iodp, vp, vSmall, fromtime, 0);
+ if (!code)
+ code = DumpVolumeHeader(iodp, vp);
+ if (!code)
+ code = DumpVnodeIndex(iodp, vp, vLarge, fromtime, dumpAllDirs);
+ if (!code)
+ code = DumpVnodeIndex(iodp, vp, vSmall, fromtime, 0);
return code;
}
-static int DumpVnodeIndex(register struct iod *iodp, Volume *vp,
- VnodeClass class, afs_int32 fromtime, int forcedump)
+static int
+DumpVnodeIndex(register struct iod *iodp, Volume * vp, VnodeClass class,
+ afs_int32 fromtime, int forcedump)
{
register int code = 0;
register struct VnodeClassInfo *vcp = &VnodeClassInfo[class];
char buf[SIZEOF_LARGEDISKVNODE];
- struct VnodeDiskObject *vnode = (struct VnodeDiskObject *) buf;
+ struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf;
StreamHandle_t *file;
FdHandle_t *fdP;
int size;
assert(size != -1);
nVnodes = (size / vcp->diskSize) - 1;
if (nVnodes > 0) {
- assert((nVnodes+1)*vcp->diskSize == size);
+ assert((nVnodes + 1) * vcp->diskSize == size);
assert(STREAM_SEEK(file, vcp->diskSize, 0) == 0);
- }
- else nVnodes = 0;
- for (vnodeIndex = 0; nVnodes && STREAM_READ(vnode, vcp->diskSize, 1, file) == 1 && !code;
- nVnodes--, vnodeIndex++) {
+ } else
+ nVnodes = 0;
+ for (vnodeIndex = 0;
+ nVnodes && STREAM_READ(vnode, vcp->diskSize, 1, file) == 1 && !code;
+ nVnodes--, vnodeIndex++) {
flag = forcedump || (vnode->serverModifyTime >= fromtime);
/* Note: the >= test is very important since some old volumes may not have
- a serverModifyTime. For an epoch dump, this results in 0>=0 test, which
- does dump the file! */
- if (!code) code = DumpVnode(iodp, vnode, V_id(vp), bitNumberToVnodeNumber(vnodeIndex, class), flag);
- if (!flag) IOMGR_Poll(); /* if we dont' xfr data, but scan instead, could lose conn */
+ * a serverModifyTime. For an epoch dump, this results in 0>=0 test, which
+ * does dump the file! */
+ if (!code)
+ code =
+ DumpVnode(iodp, vnode, V_id(vp),
+ bitNumberToVnodeNumber(vnodeIndex, class), flag);
+ if (!flag)
+ IOMGR_Poll(); /* if we dont' xfr data, but scan instead, could lose conn */
}
STREAM_CLOSE(file);
FDH_CLOSE(fdP);
return code;
}
-static int DumpDumpHeader(register struct iod *iodp, register Volume *vp,
- afs_int32 fromtime)
+static int
+DumpDumpHeader(register struct iod *iodp, register Volume * vp,
+ afs_int32 fromtime)
{
int code = 0;
int UseLatestReadOnlyClone = 1;
iodp->device = vp->device;
iodp->parentId = V_parentId(vp);
iodp->dumpPartition = vp->partition;
- if (!code) code = DumpDouble(iodp, D_DUMPHEADER, DUMPBEGINMAGIC, DUMPVERSION);
- if (!code) code = DumpInt32(iodp, 'v', UseLatestReadOnlyClone? V_id(vp): V_parentId(vp));
- if (!code) code = DumpString(iodp, 'n',V_name(vp));
+ if (!code)
+ code = DumpDouble(iodp, D_DUMPHEADER, DUMPBEGINMAGIC, DUMPVERSION);
+ if (!code)
+ code =
+ DumpInt32(iodp, 'v',
+ UseLatestReadOnlyClone ? V_id(vp) : V_parentId(vp));
+ if (!code)
+ code = DumpString(iodp, 'n', V_name(vp));
dumpTimes[0] = fromtime;
dumpTimes[1] = V_backupDate(vp); /* Until the time the clone was made */
- if (!code) code = DumpArrayInt32(iodp, 't', (afs_uint32 *)dumpTimes, 2);
+ if (!code)
+ code = DumpArrayInt32(iodp, 't', (afs_uint32 *) dumpTimes, 2);
return code;
}
-static int DumpVnode(register struct iod *iodp, struct VnodeDiskObject *v,
- int volid, int vnodeNumber, int dumpEverything)
+static int
+DumpVnode(register struct iod *iodp, struct VnodeDiskObject *v, int volid,
+ int vnodeNumber, int dumpEverything)
{
int code = 0;
IHandle_t *ihP;
if (!v || v->type == vNull)
return code;
- if (!code) code = DumpDouble(iodp, D_VNODE, vnodeNumber, v->uniquifier);
+ if (!code)
+ code = DumpDouble(iodp, D_VNODE, vnodeNumber, v->uniquifier);
if (!dumpEverything)
- return code;
- if (!code) code = DumpByte(iodp, 't',(byte)v->type);
- if (!code) code = DumpShort(iodp, 'l', v->linkCount); /* May not need this */
- if (!code) code = DumpInt32(iodp, 'v', v->dataVersion);
- if (!code) code = DumpInt32(iodp, 'm', v->unixModifyTime);
- if (!code) code = DumpInt32(iodp, 'a', v->author);
- if (!code) code = DumpInt32(iodp, 'o', v->owner);
- if (!code && v->group) code = DumpInt32(iodp, 'g', v->group); /* default group is 0 */
- if (!code) code = DumpShort(iodp, 'b', v->modeBits);
- if (!code) code = DumpInt32(iodp, 'p', v->parent);
- if (!code) code = DumpInt32(iodp, 's', v->serverModifyTime);
+ return code;
+ if (!code)
+ code = DumpByte(iodp, 't', (byte) v->type);
+ if (!code)
+ code = DumpShort(iodp, 'l', v->linkCount); /* May not need this */
+ if (!code)
+ code = DumpInt32(iodp, 'v', v->dataVersion);
+ if (!code)
+ code = DumpInt32(iodp, 'm', v->unixModifyTime);
+ if (!code)
+ code = DumpInt32(iodp, 'a', v->author);
+ if (!code)
+ code = DumpInt32(iodp, 'o', v->owner);
+ if (!code && v->group)
+ code = DumpInt32(iodp, 'g', v->group); /* default group is 0 */
+ if (!code)
+ code = DumpShort(iodp, 'b', v->modeBits);
+ if (!code)
+ code = DumpInt32(iodp, 'p', v->parent);
+ if (!code)
+ code = DumpInt32(iodp, 's', v->serverModifyTime);
if (v->type == vDirectory) {
acl_HtonACL(VVnodeDiskACL(v));
- if (!code) code = DumpByteString(iodp, 'A', (byte *) VVnodeDiskACL(v), VAclDiskSize(v));
+ if (!code)
+ code =
+ DumpByteString(iodp, 'A', (byte *) VVnodeDiskACL(v),
+ VAclDiskSize(v));
}
if (VNDISK_GET_INO(v)) {
IH_INIT(ihP, iodp->device, iodp->parentId, VNDISK_GET_INO(v));
fdP = IH_OPEN(ihP);
if (fdP == NULL) {
- Log("1 Volser: DumpVnode: dump: Unable to open inode %llu for vnode %u (volume %i); not dumped, error %d\n",
- (afs_uintmax_t)VNDISK_GET_INO(v), vnodeNumber, volid, errno);
+ Log("1 Volser: DumpVnode: dump: Unable to open inode %llu for vnode %u (volume %i); not dumped, error %d\n", (afs_uintmax_t) VNDISK_GET_INO(v), vnodeNumber, volid, errno);
IH_RELEASE(ihP);
return VOLSERREAD_DUMPERROR;
}
}
-int ProcessIndex(Volume *vp, VnodeClass class, afs_int32 **Bufp, int *sizep,
- int del)
+int
+ProcessIndex(Volume * vp, VnodeClass class, afs_int32 ** Bufp, int *sizep,
+ int del)
{
- int i, nVnodes, offset, code, index=0;
+ int i, nVnodes, offset, code, index = 0;
afs_int32 *Buf;
- int cnt=0;
+ int cnt = 0;
int size;
StreamHandle_t *afile;
FdHandle_t *fdP;
struct VnodeClassInfo *vcp = &VnodeClassInfo[class];
char buf[SIZEOF_LARGEDISKVNODE], zero[SIZEOF_LARGEDISKVNODE];
- register struct VnodeDiskObject *vnode = (struct VnodeDiskObject *) buf;
-
+ register struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf;
+
memset(zero, 0, sizeof(zero)); /* zero out our proto-vnode */
fdP = IH_OPEN(vp->vnodeIndex[class].handle);
if (fdP == NULL)
return -1;
afile = FDH_FDOPEN(fdP, "r+");
if (del) {
- int cnt1=0;
+ int cnt1 = 0;
Buf = *Bufp;
- for (i = 0; i<*sizep; i++) {
+ for (i = 0; i < *sizep; i++) {
if (Buf[i]) {
cnt++;
- STREAM_SEEK(afile, Buf[i], 0);
+ STREAM_SEEK(afile, Buf[i], 0);
code = STREAM_READ(vnode, vcp->diskSize, 1, afile);
if (code == 1) {
if (vnode->type != vNull && VNDISK_GET_INO(vnode)) {
cnt1++;
if (DoLogging) {
- afs_fsize_t vnodeLength;
- Log("RestoreVolume %u Cleanup: Removing old vnode=%u inode=%llu size=%llu\n",
- V_id(vp), bitNumberToVnodeNumber(i,class),
- (afs_uintmax_t)VNDISK_GET_INO(vnode),
- (afs_uintmax_t)vnodeLength);
+ afs_fsize_t vnodeLength;
+ Log("RestoreVolume %u Cleanup: Removing old vnode=%u inode=%llu size=%llu\n", V_id(vp), bitNumberToVnodeNumber(i, class), (afs_uintmax_t) VNDISK_GET_INO(vnode), (afs_uintmax_t) vnodeLength);
}
IH_DEC(V_linkHandle(vp), VNDISK_GET_INO(vnode),
- V_parentId(vp));
+ V_parentId(vp));
DOPOLL;
}
STREAM_SEEK(afile, Buf[i], 0);
- (void ) STREAM_WRITE(zero, vcp->diskSize, 1, afile); /* Zero it out */
+ (void)STREAM_WRITE(zero, vcp->diskSize, 1, afile); /* Zero it out */
}
Buf[i] = 0;
}
}
if (DoLogging) {
- Log("RestoreVolume Cleanup: Removed %d inodes for volume %d\n",
- cnt1, V_id(vp));
+ Log("RestoreVolume Cleanup: Removed %d inodes for volume %d\n",
+ cnt1, V_id(vp));
}
- STREAM_FLUSH(afile); /* ensure 0s are on the disk */
+ STREAM_FLUSH(afile); /* ensure 0s are on the disk */
OS_SYNC(afile->str_fd);
} else {
size = OS_SIZE(fdP->fd_fd);
assert(size != -1);
- nVnodes = (size <= vcp->diskSize ? 0 :
- size-vcp->diskSize) >> vcp->logSize;
+ nVnodes =
+ (size <=
+ vcp->diskSize ? 0 : size - vcp->diskSize) >> vcp->logSize;
if (nVnodes > 0) {
Buf = (afs_int32 *) malloc(nVnodes * sizeof(afs_int32));
- if (Buf == NULL) return 1;
+ if (Buf == NULL)
+ return 1;
memset((char *)Buf, 0, nVnodes * sizeof(afs_int32));
STREAM_SEEK(afile, offset = vcp->diskSize, 0);
while (1) {
break;
}
if (vnode->type != vNull && VNDISK_GET_INO(vnode)) {
- Buf[(offset >> vcp->logSize)-1] = offset;
+ Buf[(offset >> vcp->logSize) - 1] = offset;
cnt++;
}
offset += vcp->diskSize;
}
-int RestoreVolume(register struct rx_call *call, Volume *avp,
- int incremental, struct restoreCookie *cookie)
+int
+RestoreVolume(register struct rx_call *call, Volume * avp, int incremental,
+ struct restoreCookie *cookie)
{
VolumeDiskData vol;
struct DumpHeader header;
register Volume *vp;
struct iod iod;
register struct iod *iodp = &iod;
- afs_int32 *b1=0, *b2=0;
- int s1=0, s2=0, delo=0, tdelo;
+ afs_int32 *b1 = 0, *b2 = 0;
+ int s1 = 0, s2 = 0, delo = 0, tdelo;
int tag;
iod_Init(iodp, call);
-
+
vp = avp;
- if (!ReadDumpHeader(iodp, &header)){
+ if (!ReadDumpHeader(iodp, &header)) {
Log("1 Volser: RestoreVolume: Error reading header file for dump; aborted\n");
return VOLSERREAD_DUMPERROR;
}
- if (iod_getc(iodp) != D_VOLUMEHEADER){
+ if (iod_getc(iodp) != D_VOLUMEHEADER) {
Log("1 Volser: RestoreVolume: Volume header missing from dump; not restored\n");
return VOLSERREAD_DUMPERROR;
}
- if(ReadVolumeHeader(iodp, &vol) == VOLSERREAD_DUMPERROR) return VOLSERREAD_DUMPERROR;
+ if (ReadVolumeHeader(iodp, &vol) == VOLSERREAD_DUMPERROR)
+ return VOLSERREAD_DUMPERROR;
delo = ProcessIndex(vp, vLarge, &b1, &s1, 0);
- if (!delo) delo = ProcessIndex(vp, vSmall, &b2, &s2, 0);
+ if (!delo)
+ delo = ProcessIndex(vp, vSmall, &b2, &s2, 0);
if (delo) {
- if (b1) free((char *)b1);
- if (b2) free((char *)b2);
- b1 = b2 = 0;
+ if (b1)
+ free((char *)b1);
+ if (b2)
+ free((char *)b2);
+ b1 = b2 = 0;
}
- strncpy(vol.name,cookie->name,VOLSER_OLDMAXVOLNAME);
+ strncpy(vol.name, cookie->name, VOLSER_OLDMAXVOLNAME);
vol.type = cookie->type;
vol.cloneId = cookie->clone;
vol.parentId = cookie->parent;
-
+
tdelo = delo;
while (1) {
- if (ReadVnodes(iodp, vp, 0, b1, s1, b2, s2, tdelo)) {
- error = VOLSERREAD_DUMPERROR;
- goto clean;
- }
- tag = iod_getc(iodp);
- if (tag != D_VOLUMEHEADER)
- break;
- if (ReadVolumeHeader(iodp, &vol) == VOLSERREAD_DUMPERROR) {
- error = VOLSERREAD_DUMPERROR;
- goto out;
- }
- tdelo = -1;
+ if (ReadVnodes(iodp, vp, 0, b1, s1, b2, s2, tdelo)) {
+ error = VOLSERREAD_DUMPERROR;
+ goto clean;
+ }
+ tag = iod_getc(iodp);
+ if (tag != D_VOLUMEHEADER)
+ break;
+ if (ReadVolumeHeader(iodp, &vol) == VOLSERREAD_DUMPERROR) {
+ error = VOLSERREAD_DUMPERROR;
+ goto out;
+ }
+ tdelo = -1;
}
- if (tag != D_DUMPEND || !ReadInt32(iodp, &endMagic) || endMagic != DUMPENDMAGIC){
- Log("1 Volser: RestoreVolume: End of dump not found; restore aborted\n");
- error = VOLSERREAD_DUMPERROR;
- goto clean;
+ if (tag != D_DUMPEND || !ReadInt32(iodp, &endMagic)
+ || endMagic != DUMPENDMAGIC) {
+ Log("1 Volser: RestoreVolume: End of dump not found; restore aborted\n");
+ error = VOLSERREAD_DUMPERROR;
+ goto clean;
}
ProcessIndex(vp, vSmall, &b2, &s2, 1);
}
- clean:
+ clean:
ClearVolumeStats(&vol);
CopyVolumeHeader(&vol, &V_disk(vp));
V_destroyMe(vp) = 0;
error = VOLSERREAD_DUMPERROR;
goto out;
}
- out:
+ out:
/* Free the malloced space above */
- if (b1) free((char *)b1);
- if (b2) free((char *)b2);
+ if (b1)
+ free((char *)b1);
+ if (b2)
+ free((char *)b2);
return error;
}
-static int ReadVnodes(register struct iod *iodp, Volume *vp,
- int incremental, afs_int32 *Lbuf, afs_int32 s1,
- afs_int32 *Sbuf, afs_int32 s2, afs_int32 delo)
+static int
+ReadVnodes(register struct iod *iodp, Volume * vp, int incremental,
+ afs_int32 * Lbuf, afs_int32 s1, afs_int32 * Sbuf, afs_int32 s2,
+ afs_int32 delo)
{
afs_int32 vnodeNumber;
char buf[SIZEOF_LARGEDISKVNODE];
register tag;
- struct VnodeDiskObject *vnode = (struct VnodeDiskObject *) buf;
+ struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf;
struct VnodeDiskObject oldvnode;
int idx;
VnodeClass class;
struct VnodeClassInfo *vcp;
IHandle_t *tmpH;
FdHandle_t *fdP;
- Inode nearInode;
+ Inode nearInode;
tag = iod_getc(iodp);
V_pref(vp, nearInode);
while (tag == D_VNODE) {
- int haveStuff = 0;
- memset(buf, 0, sizeof (buf));
- if (!ReadInt32(iodp, (afs_uint32 *)&vnodeNumber))
+ int haveStuff = 0;
+ memset(buf, 0, sizeof(buf));
+ if (!ReadInt32(iodp, (afs_uint32 *) & vnodeNumber))
break;
ReadInt32(iodp, &vnode->uniquifier);
while ((tag = iod_getc(iodp)) > D_MAX && tag != EOF) {
haveStuff = 1;
switch (tag) {
- case 't':
- vnode->type = (VnodeType) iod_getc(iodp);
- break;
- case 'l':
- {
- unsigned short tlc;
- ReadShort(iodp, &tlc);
- vnode->linkCount = (signed int)tlc;
- }
- break;
- case 'v':
- ReadInt32(iodp, &vnode->dataVersion);
- break;
- case 'm':
- ReadInt32(iodp, &vnode->unixModifyTime);
- break;
- case 's':
- ReadInt32(iodp, &vnode->serverModifyTime);
- break;
- case 'a':
- ReadInt32(iodp, &vnode->author);
- break;
- case 'o':
- ReadInt32(iodp, &vnode->owner);
- break;
- case 'g':
- ReadInt32(iodp, (afs_uint32 *)&vnode->group);
- break;
- case 'b': {
+ case 't':
+ vnode->type = (VnodeType) iod_getc(iodp);
+ break;
+ case 'l':
+ {
+ unsigned short tlc;
+ ReadShort(iodp, &tlc);
+ vnode->linkCount = (signed int)tlc;
+ }
+ break;
+ case 'v':
+ ReadInt32(iodp, &vnode->dataVersion);
+ break;
+ case 'm':
+ ReadInt32(iodp, &vnode->unixModifyTime);
+ break;
+ case 's':
+ ReadInt32(iodp, &vnode->serverModifyTime);
+ break;
+ case 'a':
+ ReadInt32(iodp, &vnode->author);
+ break;
+ case 'o':
+ ReadInt32(iodp, &vnode->owner);
+ break;
+ case 'g':
+ ReadInt32(iodp, (afs_uint32 *) & vnode->group);
+ break;
+ case 'b':{
unsigned short modeBits;
ReadShort(iodp, &modeBits);
vnode->modeBits = (unsigned int)modeBits;
break;
}
- case 'p':
- ReadInt32(iodp, &vnode->parent);
- break;
- case 'A':
- ReadByteString(iodp, (byte *)VVnodeDiskACL(vnode),
- VAclDiskSize(vnode));
- acl_NtohACL(VVnodeDiskACL(vnode));
- break;
- case 'f': {
+ case 'p':
+ ReadInt32(iodp, &vnode->parent);
+ break;
+ case 'A':
+ ReadByteString(iodp, (byte *) VVnodeDiskACL(vnode),
+ VAclDiskSize(vnode));
+ acl_NtohACL(VVnodeDiskACL(vnode));
+ break;
+ case 'f':{
Inode ino;
Error error;
afs_fsize_t vnodeLength;
- ino = IH_CREATE(V_linkHandle(vp),
- V_device(vp),
- VPartitionPath(V_partition(vp)),
- nearInode, V_parentId(vp), vnodeNumber,
- vnode->uniquifier,
- vnode->dataVersion);
+ ino =
+ IH_CREATE(V_linkHandle(vp), V_device(vp),
+ VPartitionPath(V_partition(vp)), nearInode,
+ V_parentId(vp), vnodeNumber,
+ vnode->uniquifier, vnode->dataVersion);
if (!VALID_INO(ino)) {
perror("unable to allocate inode");
Log("1 Volser: ReadVnodes: Restore aborted\n");
IH_RELEASE(tmpH);
return VOLSERREAD_DUMPERROR;
}
- vnodeLength = volser_WriteFile(vnodeNumber, iodp, fdP,
- &error);
+ vnodeLength =
+ volser_WriteFile(vnodeNumber, iodp, fdP, &error);
VNDISK_SET_LEN(vnode, vnodeLength);
FDH_REALLYCLOSE(fdP);
IH_RELEASE(tmpH);
if (error) {
- Log("1 Volser: ReadVnodes: IDEC inode %llu\n",
- (afs_uintmax_t)ino);
+ Log("1 Volser: ReadVnodes: IDEC inode %llu\n",
+ (afs_uintmax_t) ino);
IH_DEC(V_linkHandle(vp), ino, V_parentId(vp));
return VOLSERREAD_DUMPERROR;
}
}
class = vnodeIdToClass(vnodeNumber);
- vcp = &VnodeClassInfo[class];
+ vcp = &VnodeClassInfo[class];
/* Mark this vnode as in this dump - so we don't delete it later */
if (!delo) {
- idx = (vnodeIndexOffset(vcp,vnodeNumber) >> vcp->logSize) - 1;
- if (class == vLarge) {
- if (Lbuf && (idx < s1)) Lbuf[idx] = 0;
- } else {
- if (Sbuf && (idx < s2)) Sbuf[idx] = 0;
- }
+ idx = (vnodeIndexOffset(vcp, vnodeNumber) >> vcp->logSize) - 1;
+ if (class == vLarge) {
+ if (Lbuf && (idx < s1))
+ Lbuf[idx] = 0;
+ } else {
+ if (Sbuf && (idx < s2))
+ Sbuf[idx] = 0;
+ }
}
if (haveStuff) {
Log("1 Volser: ReadVnodes: Error opening vnode index; restore aborted\n");
return VOLSERREAD_DUMPERROR;
}
- if (FDH_SEEK(fdP, vnodeIndexOffset(vcp, vnodeNumber), SEEK_SET) < 0) {
+ if (FDH_SEEK(fdP, vnodeIndexOffset(vcp, vnodeNumber), SEEK_SET) <
+ 0) {
Log("1 Volser: ReadVnodes: Error seeking into vnode index; restore aborted\n");
FDH_REALLYCLOSE(fdP);
return VOLSERREAD_DUMPERROR;
}
- if (FDH_READ(fdP, &oldvnode, sizeof(oldvnode)) == sizeof(oldvnode)) {
+ if (FDH_READ(fdP, &oldvnode, sizeof(oldvnode)) ==
+ sizeof(oldvnode)) {
if (oldvnode.type != vNull && VNDISK_GET_INO(&oldvnode)) {
IH_DEC(V_linkHandle(vp), VNDISK_GET_INO(&oldvnode),
- V_parentId(vp));
+ V_parentId(vp));
}
}
vnode->vnodeMagic = vcp->magic;
- if (FDH_SEEK(fdP, vnodeIndexOffset(vcp, vnodeNumber), SEEK_SET) < 0) {
+ if (FDH_SEEK(fdP, vnodeIndexOffset(vcp, vnodeNumber), SEEK_SET) <
+ 0) {
Log("1 Volser: ReadVnodes: Error seeking into vnode index; restore aborted\n");
FDH_REALLYCLOSE(fdP);
return VOLSERREAD_DUMPERROR;
* needing to read an ungetc'd character, since the ReadInt32 will have read
* it instead.
*/
-static bit32 volser_WriteFile(int vn, struct iod *iodp, FdHandle_t *handleP,
- Error *status)
+static bit32
+volser_WriteFile(int vn, struct iod *iodp, FdHandle_t * handleP,
+ Error * status)
{
afs_int32 code;
afs_uint32 filesize;
- bit32 written=0;
+ bit32 written = 0;
register afs_uint32 size = 8192;
register afs_uint32 nbytes;
unsigned char *p;
*status = 0;
if (!ReadInt32(iodp, &filesize)) {
- *status = 1;
- return(0);
+ *status = 1;
+ return (0);
}
- p = (unsigned char *) malloc(size);
+ p = (unsigned char *)malloc(size);
if (p == NULL) {
- *status = 2;
- return(0);
+ *status = 2;
+ return (0);
}
for (nbytes = filesize; nbytes; nbytes -= size) {
if (nbytes < size)
size = nbytes;
-
+
if ((code = iod_Read(iodp, p, size)) != size) {
- Log("1 Volser: WriteFile: Error reading dump file %d size=%llu nbytes=%u (%d of %u); restore aborted\n", vn, (afs_uintmax_t)filesize, nbytes, code, size);
+ Log("1 Volser: WriteFile: Error reading dump file %d size=%llu nbytes=%u (%d of %u); restore aborted\n", vn, (afs_uintmax_t) filesize, nbytes, code, size);
*status = 3;
break;
}
code = FDH_WRITE(handleP, p, size);
- if (code > 0) written += code;
+ if (code > 0)
+ written += code;
if (code != size) {
Log("1 Volser: WriteFile: Error creating file in volume; restore aborted\n");
*status = 4;
}
}
free(p);
- return(written);
+ return (written);
}
-static int ReadDumpHeader(register struct iod *iodp, struct DumpHeader *hp)
+static int
+ReadDumpHeader(register struct iod *iodp, struct DumpHeader *hp)
{
register tag;
afs_uint32 beginMagic;
if (iod_getc(iodp) != D_DUMPHEADER || !ReadInt32(iodp, &beginMagic)
- || !ReadInt32(iodp, (afs_uint32 *)&hp->version)
- || beginMagic != DUMPBEGINMAGIC
- ) return 0;
+ || !ReadInt32(iodp, (afs_uint32 *) & hp->version)
+ || beginMagic != DUMPBEGINMAGIC)
+ return 0;
hp->volumeId = 0;
hp->nDumpTimes = 0;
while ((tag = iod_getc(iodp)) > D_MAX) {
- unsigned short arrayLength;
- register int i;
- switch(tag) {
- case 'v':
- if (!ReadInt32(iodp, &hp->volumeId))
- return 0;
- break;
- case 'n':
- ReadString(iodp, hp->volumeName, sizeof(hp->volumeName));
- break;
- case 't':
- if (!ReadShort(iodp, &arrayLength))
+ unsigned short arrayLength;
+ register int i;
+ switch (tag) {
+ case 'v':
+ if (!ReadInt32(iodp, &hp->volumeId))
+ return 0;
+ break;
+ case 'n':
+ ReadString(iodp, hp->volumeName, sizeof(hp->volumeName));
+ break;
+ case 't':
+ if (!ReadShort(iodp, &arrayLength))
+ return 0;
+ hp->nDumpTimes = (arrayLength >> 1);
+ for (i = 0; i < hp->nDumpTimes; i++)
+ if (!ReadInt32(iodp, (afs_uint32 *) & hp->dumpTimes[i].from)
+ || !ReadInt32(iodp, (afs_uint32 *) & hp->dumpTimes[i].to))
return 0;
- hp->nDumpTimes = (arrayLength >> 1);
- for (i = 0; i<hp->nDumpTimes; i++)
- if (!ReadInt32(iodp, (afs_uint32 *)&hp->dumpTimes[i].from)
- || !ReadInt32(iodp, (afs_uint32 *)&hp->dumpTimes[i].to))
- return 0;
- break;
+ break;
}
}
if (!hp->volumeId || !hp->nDumpTimes) {
/* ----- Below are the calls that calculate dump size ----- */
-static int SizeDumpVolumeHeader(register struct iod *iodp, register Volume *vp, register struct volintSize *v_size)
+static int
+SizeDumpVolumeHeader(register struct iod *iodp, register Volume * vp,
+ register struct volintSize *v_size)
{
int code = 0;
- static char nullString[1] = ""; /*The ``contents'' of motd*/
+ static char nullString[1] = ""; /*The ``contents'' of motd */
/* if (!code) code = DumpTag(iodp, D_VOLUMEHEADER); */
v_size->dump_size += 1;
/* if (!code) code = DumpString(iodp, 'M', nullString); */
v_size->dump_size += (2 + strlen(nullString));
/* if (!code) code = DumpArrayInt32(iodp, 'W', (afs_uint32 *)V_weekUse(vp), sizeof(V_weekUse(vp))/sizeof(V_weekUse(vp)[0])); */
- v_size->dump_size += (3 + 4*(sizeof(V_weekUse(vp))/sizeof(V_weekUse(vp)[0])));
+ v_size->dump_size +=
+ (3 + 4 * (sizeof(V_weekUse(vp)) / sizeof(V_weekUse(vp)[0])));
/* if (!code) code = DumpInt32(iodp, 'D', V_dayUseDate(vp)); */
v_size->dump_size += 5;
/* if (!code) code = DumpInt32(iodp, 'Z', V_dayUse(vp)); */
return code;
}
-static int SizeDumpEnd(register struct iod *iodp, register struct volintSize *v_size)
+static int
+SizeDumpEnd(register struct iod *iodp, register struct volintSize *v_size)
{
int code = 0;
v_size->dump_size += 5;
return code;
}
-int SizeDumpVolume(register struct rx_call *call, register Volume *vp, afs_int32 fromtime,
- int dumpAllDirs, register struct volintSize *v_size)
+int
+SizeDumpVolume(register struct rx_call *call, register Volume * vp,
+ afs_int32 fromtime, int dumpAllDirs,
+ register struct volintSize *v_size)
{
struct iod iod;
int code = 0;
register struct iod *iodp = (struct iod *)0;
/* iod_Init(iodp, call); */
- if (!code) code = SizeDumpDumpHeader(iodp, vp, fromtime, v_size);
- if (!code) code = SizeDumpPartial(iodp, vp, fromtime, dumpAllDirs, v_size);
- if (!code) code = SizeDumpEnd(iodp, v_size);
-
+ if (!code)
+ code = SizeDumpDumpHeader(iodp, vp, fromtime, v_size);
+ if (!code)
+ code = SizeDumpPartial(iodp, vp, fromtime, dumpAllDirs, v_size);
+ if (!code)
+ code = SizeDumpEnd(iodp, v_size);
+
return code;
}
-static int SizeDumpDumpHeader(register struct iod *iodp, register Volume *vp, afs_int32 fromtime,
- register struct volintSize *v_size)
+static int
+SizeDumpDumpHeader(register struct iod *iodp, register Volume * vp,
+ afs_int32 fromtime, register struct volintSize *v_size)
{
int code = 0;
int UseLatestReadOnlyClone = 1;
/* iodp->parentId = V_parentId(vp); */
/* iodp->dumpPartition = vp->partition; */
- v_size->dump_size = 0; /* initialize the size */
+ v_size->dump_size = 0; /* initialize the size */
/* if (!code) code = DumpDouble(iodp, D_DUMPHEADER, DUMPBEGINMAGIC, DUMPVERSION); */
v_size->dump_size += 9;
/* if (!code) code = DumpInt32(iodp, 'v', UseLatestReadOnlyClone? V_id(vp): V_parentId(vp)); */
/* dumpTimes[0] = fromtime; */
/* dumpTimes[1] = V_backupDate(vp); /\* Until the time the clone was made *\/ */
/* if (!code) code = DumpArrayInt32(iodp, 't', (afs_uint32 *)dumpTimes, 2); */
- v_size->dump_size += (3 + 4*2);
+ v_size->dump_size += (3 + 4 * 2);
return code;
}
-static int SizeDumpVnode(register struct iod *iodp, struct VnodeDiskObject *v, int volid, int vnodeNumber, int dumpEverything,
- register struct volintSize *v_size)
+static int
+SizeDumpVnode(register struct iod *iodp, struct VnodeDiskObject *v, int volid,
+ int vnodeNumber, int dumpEverything,
+ register struct volintSize *v_size)
{
int code = 0;
/* if (!code) code = DumpDouble(iodp, D_VNODE, vnodeNumber, v->uniquifier); */
v_size->dump_size += 9;
if (!dumpEverything)
- return code;
+ return code;
/* if (!code) code = DumpByte(iodp, 't',(byte)v->type); */
v_size->dump_size += 2;
/* if (!code) code = DumpShort(iodp, 'l', v->linkCount); /\* May not need this *\/ */
/* if (!code) code = DumpInt32(iodp, 'o', v->owner); */
v_size->dump_size += 5;
/* if (!code && v->group) code = DumpInt32(iodp, 'g', v->group); /\* default group is 0 *\/ */
- if(v->group) v_size->dump_size += 5;
+ if (v->group)
+ v_size->dump_size += 5;
/* if (!code) code = DumpShort(iodp, 'b', v->modeBits); */
v_size->dump_size += 3;
/* if (!code) code = DumpInt32(iodp, 'p', v->parent); */
if (VNDISK_GET_INO(v)) {
v_size->dump_size += (v->length + 5);
- }
+ }
return code;
}
/* A partial dump (no dump header) */
-static int SizeDumpPartial(register struct iod *iodp, register Volume *vp, afs_int32 fromtime, int dumpAllDirs,
- register struct volintSize *v_size)
+static int
+SizeDumpPartial(register struct iod *iodp, register Volume * vp,
+ afs_int32 fromtime, int dumpAllDirs,
+ register struct volintSize *v_size)
{
int code = 0;
- if (!code) code = SizeDumpVolumeHeader(iodp, vp, v_size);
- if (!code) code = SizeDumpVnodeIndex(iodp, vp, vLarge, fromtime, dumpAllDirs, v_size);
- if (!code) code = SizeDumpVnodeIndex(iodp, vp, vSmall, fromtime, 0, v_size);
+ if (!code)
+ code = SizeDumpVolumeHeader(iodp, vp, v_size);
+ if (!code)
+ code =
+ SizeDumpVnodeIndex(iodp, vp, vLarge, fromtime, dumpAllDirs,
+ v_size);
+ if (!code)
+ code = SizeDumpVnodeIndex(iodp, vp, vSmall, fromtime, 0, v_size);
return code;
}
-static int SizeDumpVnodeIndex(register struct iod *iodp, Volume *vp, VnodeClass class, afs_int32 fromtime,
- int forcedump, register struct volintSize *v_size)
+static int
+SizeDumpVnodeIndex(register struct iod *iodp, Volume * vp, VnodeClass class,
+ afs_int32 fromtime, int forcedump,
+ register struct volintSize *v_size)
{
register int code = 0;
register struct VnodeClassInfo *vcp = &VnodeClassInfo[class];
char buf[SIZEOF_LARGEDISKVNODE];
- struct VnodeDiskObject *vnode = (struct VnodeDiskObject *) buf;
+ struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf;
StreamHandle_t *file;
FdHandle_t *fdP;
int size;
assert(file != NULL);
size = OS_SIZE(fdP->fd_fd);
assert(size != -1);
- nVnodes = (size / vcp->diskSize) - 1;
+ nVnodes = (size / vcp->diskSize) - 1;
if (nVnodes > 0) {
- assert((nVnodes+1)*vcp->diskSize == size);
+ assert((nVnodes + 1) * vcp->diskSize == size);
assert(STREAM_SEEK(file, vcp->diskSize, 0) == 0);
- }
- else nVnodes = 0;
- for (vnodeIndex = 0; nVnodes && STREAM_READ(vnode, vcp->diskSize, 1, file) == 1 && !code;
- nVnodes--, vnodeIndex++) {
+ } else
+ nVnodes = 0;
+ for (vnodeIndex = 0;
+ nVnodes && STREAM_READ(vnode, vcp->diskSize, 1, file) == 1 && !code;
+ nVnodes--, vnodeIndex++) {
flag = forcedump || (vnode->serverModifyTime >= fromtime);
/* Note: the >= test is very important since some old volumes may not have
- a serverModifyTime. For an epoch dump, this results in 0>=0 test, which
- does dump the file! */
- if (!code) code = SizeDumpVnode(iodp, vnode, V_id(vp), bitNumberToVnodeNumber(vnodeIndex, class), flag, v_size);
+ * a serverModifyTime. For an epoch dump, this results in 0>=0 test, which
+ * does dump the file! */
+ if (!code)
+ code =
+ SizeDumpVnode(iodp, vnode, V_id(vp),
+ bitNumberToVnodeNumber(vnodeIndex, class), flag,
+ v_size);
}
STREAM_CLOSE(file);
FDH_CLOSE(fdP);
return code;
}
-
git://git.openafs.org / openafs.git / blobdiff