salvager: redd up showlog global flag

[openafs.git] / src / vol / vol-salvage.h

diff --git a/src/vol/vol-salvage.h b/src/vol/vol-salvage.h
index b6babab..83bc55f 100644 (file)
--- a/src/vol/vol-salvage.h
+++ b/src/vol/vol-salvage.h
@@ -22,8 +22,8 @@
 /* salvager data structures */
 struct InodeSummary {          /* Inode summary file--an entry for each
                                 * volume in the inode file for a partition */
-    VolId volumeId;            /* Volume id */
-    VolId RWvolumeId;          /* RW volume associated */
+    VolumeId volumeId;         /* Volume id */
+    VolumeId RWvolumeId;               /* RW volume associated */
     int index;                 /* index into inode file (0, 1, 2 ...) */
     int nInodes;               /* Number of inodes for this volume */
     int nSpecialInodes;                /* Number of special inodes, i.e.  volume
@@ -52,8 +52,6 @@ struct VolumeSummary {                /* Volume summary an entry for each
                                 * volume in a volume directory.
                                 * Assumption: one volume directory per
                                 * partition */
-    char *fileName;            /* File name on the partition for the volume
-                                * header */
     struct VolumeHeader header;
     /* volume number, rw volume number, inode
      * numbers of each major component of
@@ -63,6 +61,8 @@ struct VolumeSummary {                /* Volume summary an entry for each
     byte wouldNeedCallback;    /* set if the file server should issue
                                 * call backs for all the files in this volume when
                                 * the volume goes back on line */
+    byte unused;                /* is this volume 'extra'? i.e. not referenced
+                                 * by anything? */
 };
 
 struct VnodeInfo {
@@ -193,6 +193,7 @@ extern void Exit(int code) AFS_NORETURN;
 extern int Fork(void);
 extern int Wait(char *prog);
 extern char *ToString(const char *s);
+extern int AskDAFS(void);
 extern void AskOffline(struct SalvInfo *salvinfo, VolumeId volumeId);
 extern void AskOnline(struct SalvInfo *salvinfo, VolumeId volumeId);
 extern void AskDelete(struct SalvInfo *salvinfo, VolumeId volumeId);
@@ -222,7 +223,6 @@ extern void ObtainSalvageLock(void);
 extern void ObtainSharedSalvageLock(void);
 extern void PrintInodeList(struct SalvInfo *salvinfo);
 extern void PrintInodeSummary(struct SalvInfo *salvinfo);
-extern void PrintVolumeSummary(struct SalvInfo *salvinfo);
 extern int QuickCheck(struct SalvInfo *salvinfo, struct InodeSummary *isp,
                       int nVols);
 extern void RemoveTheForce(char *path);
@@ -246,15 +246,12 @@ 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,
                                    struct ViceInodeInfo *inodes, int RW,
                                    int check, int *deleteMe);
-extern void showlog(void);
 extern int UseTheForceLuke(char *path);