OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_76-2206-gfb03b13
Gerrit Code Review
Fri, 24 Feb 2012 04:28:49 -0800 (PST)
The following commit has been merged in the master branch:
Author: Andrew Deason <email@example.com>
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 <firstname.lastname@example.org>
Tested-by: BuildBot <email@example.com>
src/vol/vol-salvage.c | 38 ++++++++++++++++++++------------------
src/vol/vol-salvage.h | 4 ++--
2 files changed, 22 insertions(+), 20 deletions(-)
OpenAFS Master Repository