jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STABLE14-ptutil-swap-epoch-version-as-needed-20080327

Browse Source 
LICENSE IPL10
FIXES 90869

do byteswapping of epoch and version so we print and compare sensibly


(cherry picked from commit 87e959e87df52e026ffcb2de8ecfcbf4889f7bd8)
This commit is contained in:
Derrick Brashear 2008-03-27 18:40:22 +00:00
parent 64f21eeacb
commit c2a283aa65
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ptserver/pt_util.c
View File

@ -196,8 +196,9 @@ CommandProc(register struct cmd_syndesc *a_as, void *arock)
fprintf(stderr, "pt_util: %s: Bad UBIK_MAGIC. Is %x should be %x\n",
pfile, ntohl(uh->magic), UBIK_MAGIC);
memcpy(&uv, &uh->version, sizeof(struct ubik_version));
if (wflag && uv.epoch == 0 && uv.counter == 0) {
uv.epoch = 2; /* a ubik version of 0 or 1 has special meaning */
if (wflag && ntohl(uv.epoch) == 0 && ntohl(uv.counter) == 0) {
uv.epoch = htonl(2); /* a ubik version of 0 or 1 has special meaning */
memcpy(&uh->version, &uv, sizeof(struct ubik_version));
lseek(dbase_fd, 0, SEEK_SET);
if (write(dbase_fd, buffer, HDRSIZE) < 0) {
@ -206,6 +207,11 @@ CommandProc(register struct cmd_syndesc *a_as, void *arock)
exit(1);
}
}
/* Now that any writeback is done, swap these */
uv.epoch = ntohl(uv.epoch);
uv.counter = ntohl(uv.counter);
fprintf(stderr, "Ubik Version is: %d.%d\n", uv.epoch, uv.counter);
if (read(dbase_fd, &prh, sizeof(struct prheader)) < 0) {
fprintf(stderr, "pt_util: error reading %s: %s\n", pfile,
@ -329,6 +335,10 @@ CommandProc(register struct cmd_syndesc *a_as, void *arock)
exit(1);
}
uh = (struct ubik_hdr *)buffer;
uh->version.epoch = ntohl(uh->version.epoch);
uh->version.counter = ntohl(uh->version.counter);
if ((uh->version.epoch != uv.epoch)
|| (uh->version.counter != uv.counter)) {
fprintf(stderr,