revert-voldump-v-tag-generation-20090629

LICENSE IPL10
FIXES 18349

generating v tags is currently incompatible. revert this for now

diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c
index 96a4dfeb06f2371b2fbae6e2fe18229da6990347..8feb5490f96478fde8f94e0f41f00068ed585569 100644 (file)
--- 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 c04f8ea34953c1a840bb5b5a9ccf472be04a0fe6..113956e3d63ff64c0e6cba6cd282ce6d6e080270 100644 (file)
--- 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 a6906507c6f2fc842e600fc8a61d3fe234f9961a..58299b02af1fa0ad189be2c9056e7520e16801c5 100644 (file)
--- 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;
 }