OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_5-60-g98222fb

Gerrit Code Review
Wed, 11 Sep 2013 14:36:33 -0700 (PDT)

The following commit has been merged in the openafs-stable-1_6_x branch:
commit 98222fb3b0b9adebb734195c7c21f646fc7c9b70
Author: Andrew Deason <>
Date:   Tue Feb 21 17:40:46 2012 -0600

    salvager: Do not set fileName on header fixup
    Currently, SalvageVolumeHeaderFile will set isp->volSummary->fileName
    to a new string whenever the volume header needs to be created or
    re-written. When control reaches back to SalvageFileSys1, this can
    cause DeleteExtraVolumeHeaderFile to delete the header, since
    vsp->fileName is used as a sort of indicator to see whether or not a
    volume has been referenced by the inode summary.
    When we create a new header, we avoid this because we allocate a new
    VolumeSummary struct, which is not caught by the last
    DeleteExtraVolumeHeaderFile for loop in SalvageFileSys1. However, we
    do delete the header when we simply re-write a header, since we use
    the existing VolumeSummary struct. Set fileName in neither, for
    Reviewed-by: Derrick Brashear <>
    Tested-by: BuildBot <>
    (cherry picked from commit 76f12c2389fd2a8e09b4e869730169401d154ce9)
    Change-Id: I4d59de02a190a6d175735482aa102a496407f32a
    Reviewed-by: Derrick Brashear <>
    Reviewed-by: Andrew Deason <>
    Tested-by: BuildBot <>
    Reviewed-by: Stephan Wiesand <>

 src/vol/vol-salvage.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

OpenAFS Master Repository