OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_0b-151-gf718feb

Gerrit Code Review gerrit@openafs.org
Sun, 20 Nov 2011 15:37:35 -0800 (PST)


The following commit has been merged in the openafs-stable-1_6_x branch:
commit 0d741616a8e8d1daf60b117f2be8f7768b3fd882
Author: Andrew Deason <adeason@sinenomine.net>
Date:   Wed Nov 9 17:04:09 2011 -0600

    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 <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementix.org>
    (cherry picked from commit 9ba891676a15512fa58915662cf599ea73eac430)
    
    Change-Id: Iece9f5b03f0454b7f833e4f3e86da4478b4441fe
    Reviewed-on: http://gerrit.openafs.org/6080
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementix.org>

 src/volser/dumpstuff.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

-- 
OpenAFS Master Repository