From 02aa30893f79b0a3d3ed75da987e20d48071c5df Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Mon, 11 Jul 2011 15:45:11 -0400 Subject: [PATCH 1/1] salvager: do not redefine SalvageVolumeGroup Do not use the c preprocessor to redefine the SalvageVolumeGroup() function name. Change-Id: I3d48ee28dc03be702d0427d74725ff1e99ec6411 Reviewed-on: http://gerrit.openafs.org/4965 Reviewed-by: Andrew Deason Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/vol/vol-salvage.c | 9 +++++++-- src/vol/vol-salvage.h | 4 +--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c index 78422f4..af5b912 100644 --- a/src/vol/vol-salvage.c +++ b/src/vol/vol-salvage.c @@ -889,7 +889,12 @@ SalvageFileSys1(struct DiskPartition64 *partP, VolumeId singleVolumeNumber) /* Salvage the group of volumes (several read-only + 1 read/write) * starting with the current read-only volume we're looking at. */ - SalvageVolumeGroup(salvinfo, &salvinfo->inodeSummary[i], j - i); +#ifdef AFS_NT40_ENV + nt_SalvageVolumeGroup(salvinfo, &salvinfo->inodeSummary[i], j - i); +#else + DoSalvageVolumeGroup(salvinfo, &salvinfo->inodeSummary[i], j - i); +#endif /* AFS_NT40_ENV */ + } /* Delete any additional volumes that were listed in the partition but which didn't have any corresponding inodes */ @@ -1848,7 +1853,7 @@ nt_SVG(void *arg) } void -SalvageVolumeGroup(struct SalvInfo *salvinfo, struct InodeSummary *isp, int nVols) +nt_SalvageVolumeGroup(struct SalvInfo *salvinfo, struct InodeSummary *isp, int nVols) { pthread_t tid; pthread_attr_t tattr; diff --git a/src/vol/vol-salvage.h b/src/vol/vol-salvage.h index 3f05900..ecf524e 100644 --- a/src/vol/vol-salvage.h +++ b/src/vol/vol-salvage.h @@ -247,9 +247,7 @@ extern int SalvageVolume(struct SalvInfo *salvinfo, struct InodeSummary *rwIsp, extern void DoSalvageVolumeGroup(struct SalvInfo *salvinfo, struct InodeSummary *isp, int nVols); #ifdef AFS_NT40_ENV -extern void SalvageVolumeGroup(struct SalvInfo *salvinfo, struct InodeSummary *isp, int nVols); -#else -#define SalvageVolumeGroup DoSalvageVolumeGroup +extern void nt_SalvageVolumeGroup(struct SalvInfo *salvinfo, struct InodeSummary *isp, int nVols); #endif extern int SalvageVolumeHeaderFile(struct SalvInfo *salvinfo, struct InodeSummary *isp, -- 1.9.4