revert-voldump-v-tag-generation-20090629

LICENSE IPL10
FIXES 18349

generating v tags is currently incompatible. revert this for now
This commit is contained in:
Derrick Brashear 2009-06-29 16:19:59 +00:00
parent 3d5415922e
commit f202b9778e
3 changed files with 3 additions and 9 deletions

View File

@ -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;
}

View File

@ -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:

View File

@ -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;
}