From 4623a98cdf5fdaa96bd2cfc9607afc0806486f5d Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Mon, 21 Sep 2009 12:48:30 -0500 Subject: [PATCH] Unlink correct files in salvager Fallout from 0ac956b3384842b3c60e72bde78a4baf58a5877f; a couple of unlink() calls were not updated to use the absolute path. Update them, and log errors from unlink(), since otherwise it is difficult to tell that anything is going wrong. Reviewed-on: http://gerrit.openafs.org/479 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 29ee678f3ab051a27cae46b02a0d42e0958a6bc8) Change-Id: Ic7bc1f3470e705f03fee044f438804cdd211db6b Reviewed-on: http://gerrit.openafs.org/962 --- src/vol/vol-salvage.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c index b217481e1..bd3f3b38f 100644 --- a/src/vol/vol-salvage.c +++ b/src/vol/vol-salvage.c @@ -1385,10 +1385,16 @@ SalvageFileSys1(struct DiskPartition64 *partP, VolumeId singleVolumeNumber) void DeleteExtraVolumeHeaderFile(register struct VolumeSummary *vsp) { + char path[64]; + sprintf(path, "%s/%s", fileSysPath, vsp->fileName); + if (!Showmode) - Log("The volume header file %s is not associated with any actual data (%sdeleted)\n", vsp->fileName, (Testing ? "would have been " : "")); - if (!Testing) - unlink(vsp->fileName); + Log("The volume header file %s is not associated with any actual data (%sdeleted)\n", path, (Testing ? "would have been " : "")); + if (!Testing) { + if (unlink(path)) { + Log("Unable to unlink %s (errno = %d)\n", path, errno); + } + } vsp->fileName = 0; } @@ -3777,8 +3783,13 @@ MaybeZapVolume(register struct InodeSummary *isp, char *message, int deleteMe, if (!Showmode) Log("it will be deleted instead. It should be recloned.\n"); } - if (!Testing) - unlink(isp->volSummary->fileName); + if (!Testing) { + char path[64]; + sprintf(path, "%s/%s", fileSysPath, isp->volSummary->fileName); + if (unlink(path)) { + Log("Unable to unlink %s (errno = %d)\n", path, errno); + } + } } } else if (!check) { Log("%s salvage was unsuccessful: read-write volume %u\n", message, -- 2.39.5