From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 19 Aug 2010 16:35:40 +0000 (-0500)
Subject: Windows: vol-salvage SalvInfo fixes
X-Git-Tag: upstream/1.8.0_pre1^2~4917
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=87dc2a312ac94bc0a8b809a8f879128be8d9c791;p=packages%2Fo%2Fopenafs.git

Windows: vol-salvage SalvInfo fixes

Commit 3d7388b790ef21de552ec60d379764df067ae421 broke the windows
build. Fix it:

 - SVGParms_t has no salvinfo member, but an svgp_salvinfo member

 - Correct the SalvageVolumeGroup prototype to match the actual
   implementation

Change-Id: I6515ff8a3850b09e959c95387c3e7c22b40794c1
Reviewed-on: http://gerrit.openafs.org/2595
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index b34bc00f6..148879ab4 100644
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -1801,7 +1801,7 @@ void *
 nt_SVG(void *arg)
 {
     SVGParms_t *parms = (SVGParms_t *) arg;
-    DoSalvageVolumeGroup(parms->salvinfo, parms->svgp_inodeSummaryp, parms->svgp_count);
+    DoSalvageVolumeGroup(parms->svgp_salvinfo, parms->svgp_inodeSummaryp, parms->svgp_count);
     return NULL;
 }
 
diff --git a/src/vol/vol-salvage.h b/src/vol/vol-salvage.h
index 9984ee2dc..9073a7688 100644
--- a/src/vol/vol-salvage.h
+++ b/src/vol/vol-salvage.h
@@ -244,7 +244,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 InodeSummary *isp, int nVols);
+extern void SalvageVolumeGroup(struct SalvInfo *salvinfo, struct InodeSummary *isp, int nVols);
 #else
 #define SalvageVolumeGroup DoSalvageVolumeGroup
 #endif