From: Andrew Deason Date: Wed, 9 Nov 2011 23:04:09 +0000 (-0600) Subject: volser: Preserve needsSalvaged during restore X-Git-Tag: upstream/1.6.1.pre1^2~98 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0d741616a8e8d1daf60b117f2be8f7768b3fd882;p=packages%2Fo%2Fopenafs.git volser: Preserve needsSalvaged during restore Some of the routines during a volume restore may set needsSalvaged, if an inconsistency is detected while writing the given volume data. However, after the data is read, we set the volume header information to what was found in the dump stream, ignoring any needsSalvaged that may have been set. To ensure that inconsistent volumes in this situation actually get demand-salvaged (for DAFS) or offlined (non-DAFS), keep the value of needsSalvaged in the header, if it was set. Reviewed-on: http://gerrit.openafs.org/5822 Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 9ba891676a15512fa58915662cf599ea73eac430) Change-Id: Iece9f5b03f0454b7f833e4f3e86da4478b4441fe Reviewed-on: http://gerrit.openafs.org/6080 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index def1b0f1b..fb07ce247 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -1232,6 +1232,8 @@ RestoreVolume(struct rx_call *call, Volume * avp, int incremental, vol.cloneId = cookie->clone; vol.parentId = cookie->parent; + V_needsSalvaged(vp) = 0; + tdelo = delo; while (1) { if (ReadVnodes(iodp, vp, 0, b1, s1, b2, s2, tdelo)) { @@ -1273,6 +1275,11 @@ RestoreVolume(struct rx_call *call, Volume * avp, int incremental, clean: ClearVolumeStats(&vol); + if (V_needsSalvaged(vp)) { + /* needsSalvaged may have been set while we tried to write volume data. + * prevent it from getting overwritten. */ + vol.needsSalvaged = V_needsSalvaged(vp); + } CopyVolumeHeader(&vol, &V_disk(vp)); V_destroyMe(vp) = 0; VUpdateVolume(&vupdate, vp);