From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 4 Dec 2003 17:02:38 +0000 (+0000)
Subject: salvager-remove-orphaned-header-20031204
X-Git-Tag: openafs-devel-1_3_51~56
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ebe5567b3beec22e6e0608c3ff14b57dd625cf73;p=packages%2Fo%2Fopenafs.git

salvager-remove-orphaned-header-20031204

FIXES 2522

this should be fixed for the global case, but that's harder to test
---

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index 81267b551..ccd138ba6 100644
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -1592,6 +1592,17 @@ GetInodeSummary(char *path, VolumeId singleVolumeNumber)
 	    unlink(summaryFileName);
 	    if (!singleVolumeNumber)	/* Remove the FORCESALVAGE file */
 		RemoveTheForce(fileSysPath);
+	    else {
+		struct VolumeSummary *vsp;
+		int i, j;
+
+		GetVolumeSummary(singleVolumeNumber);
+
+		for (i = 0,vsp = volumeSummaryp; i < nVolumes; i++) {
+		    if (vsp->fileName)
+			DeleteExtraVolumeHeaderFile(vsp);
+		}
+	    }
 	    Log("%s vice inodes on %s; not salvaged\n",
 		singleVolumeNumber ? "No applicable" : "No", dev);
 	    return -1;