OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_5-63-g42a59d2

Gerrit Code Review
Wed, 11 Sep 2013 14:39:23 -0700 (PDT)

The following commit has been merged in the openafs-stable-1_6_x branch:
commit 42a59d23a327380fc94ca2ff04bc5e4ff3bbf305
Author: Andrew Deason <>
Date:   Tue Feb 21 18:05:32 2012 -0600

    salvager: Remove VolumeSummary->fileName
    The 'fileName' field in VolumeSummary serves two apparent purposes:
     - Storing the filename of the volume header file (V0XXX.vol).
     - Indicating whether or not a given VolumeSummary object is
       referenced by any inodes on disk. fileName is set by
       AskVolumeSummary/GetVolumeSummary, and is cleared in
       SalvageFileSys1 when a matching inodeSummary entry is found.
    This is very confusing. The first purpose is completely unnecessary;
    we can always calculate the filename from the volume id for the
    volume, and we already enforce the filename to be of that specific
    format. The second purpose is very unclear in the current code, and
    overloads the meaning of the field.
    So instead, remove fileName entirely. Code that was using it to locate
    the header file are changed to use VolumeExternalName_r. Code that was
    using the field to determine if the volume is "unused" is changed to
    use a field just called "unused", set to 0 or 1.
    Reviewed-by: Derrick Brashear <>
    Tested-by: BuildBot <>
    (cherry picked from commit 2a1719faa810663d6d9cf774339e286c18ef2717)
    Change-Id: I295ef6c982991bdeeb533c55e6ba6d3175789ce6
    Reviewed-by: Andrew Deason <>
    Reviewed-by: Derrick Brashear <>
    Tested-by: BuildBot <>
    Reviewed-by: Stephan Wiesand <>

 src/vol/vol-salvage.c |   37 ++++++++++++++++++++-----------------
 src/vol/vol-salvage.h |    4 ++--
 2 files changed, 22 insertions(+), 19 deletions(-)

OpenAFS Master Repository