From f202b9778e4489fd80288c5be36e3c102b0cfba9 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Mon, 29 Jun 2009 16:19:59 +0000 Subject: [PATCH] revert-voldump-v-tag-generation-20090629 LICENSE IPL10 FIXES 18349 generating v tags is currently incompatible. revert this for now --- src/volser/dumpstuff.c | 7 +------ src/volser/restorevol.c | 3 ++- src/volser/vol-dump.c | 2 -- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index 96a4dfeb06..8feb5490f9 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -385,7 +385,7 @@ ReadVolumeHeader(register struct iod *iodp, VolumeDiskData * vol) return VOLSERREAD_DUMPERROR; break; case 'V': - if (!ReadInt32(iodp, (afs_uint32 *) & vol->volUpdateCounter)) + if (!ReadInt32(iodp, (afs_uint32 *) &trash/*volUpdateCounter*/)) return VOLSERREAD_DUMPERROR; break; } @@ -727,8 +727,6 @@ DumpVolumeHeader(register struct iod *iodp, register Volume * vp) code = DumpInt32(iodp, 'D', V_dayUseDate(vp)); if (!code) code = DumpInt32(iodp, 'Z', V_dayUse(vp)); - if (!code) - code = DumpInt32(iodp, 'V', V_volUpCounter(vp)); return code; } @@ -1514,9 +1512,6 @@ SizeDumpVolumeHeader(register struct iod *iodp, register Volume * vp, /* if (!code) code = DumpInt32(iodp, 'Z', V_dayUse(vp)); */ FillInt64(addvar,0, 5); AddUInt64(v_size->dump_size, addvar, &v_size->dump_size); -/* if (!code) code = DumpInt32(iodp, 'V', V_volUpCounter(vp)); */ - FillInt64(addvar,0, 5); - AddUInt64(v_size->dump_size, addvar, &v_size->dump_size); return code; } diff --git a/src/volser/restorevol.c b/src/volser/restorevol.c index c04f8ea349..113956e3d6 100644 --- a/src/volser/restorevol.c +++ b/src/volser/restorevol.c @@ -345,8 +345,9 @@ ReadVolumeHeader(count) case 'Z': vh.dayUse = ntohl(readvalue(4)); break; + case 'V': - vh.volUpdateCounter = ntohl(readvalue(4)); + readvalue(4); /*volUpCounter*/ break; default: diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c index a6906507c6..58299b02af 100644 --- a/src/volser/vol-dump.c +++ b/src/volser/vol-dump.c @@ -519,8 +519,6 @@ DumpVolumeHeader(int dumpfd, register Volume * vp) code = DumpInt32(dumpfd, 'D', V_dayUseDate(vp)); if (!code) code = DumpInt32(dumpfd, 'Z', V_dayUse(vp)); - if (!code) - code = DumpInt32(dumpfd, 'V', V_volUpCounter(vp)); return code; }