Make the inode fileserver backend build again

 - Unconditionally build int64_to_flipbase64 and flipbase64_to_int64.
   These are only used by namei, but are referenced by the
   liboafs_util export list

 - Include rx_queue.h in listinodes.c, so the queue elements in
   various structures are defined.

 - Rename vfsck's getline, so we don't conflict with stdio's getline

 - Fix the includes in vfsck/dirutils.c so we get a definition for
   VolumeId

 - salvageserver needs libsys for various ihandle operations

Change-Id: Ibed3439c1eca499e2ada785e1e8186f4480117a4
Reviewed-on: http://gerrit.openafs.org/9966
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index 013574fc55075c75da7e11f31d9e9eda6803e5b8..169255ad611bc1d27cbe3337af9e4af88e34216e 100644 (file)
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -46,6 +46,7 @@ FSSDEBUG_OBJS = fssync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS}
 SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS}
 
 LIBS=   \
+       $(top_builddir)/src/sys/liboafs_sys.la \
        $(top_builddir)/src/rx/liboafs_rx.la \
        $(top_builddir)/src/util/liboafs_util.la \
        $(top_builddir)/src/cmd/liboafs_cmd.la \

diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h
index b969ab224549a1fc24983602253ffce9ee3b5d2b..71afc3f759f8e9fd81676d1658f848c2cb8e2d15 100644 (file)
--- a/src/util/afsutil_prototypes.h
+++ b/src/util/afsutil_prototypes.h
@@ -49,7 +49,7 @@ extern void FilepathNormalize(char *path);
 /* flipbase64.c */
 extern char *int_to_base32(b32_string_t s, int a);
 extern int base32_to_int(char *s);
-#if defined(AFS_NAMEI_ENV) && !defined(AFS_NT40_ENV)
+#if !defined(AFS_NT40_ENV)
 /* base 64 converters for namei interface. Flip bits to differences are
  * early in name.
  */

diff --git a/src/util/flipbase64.c b/src/util/flipbase64.c
index 7498a3d09eb9685a18de379326623a04500d080f..ce873bb058a9f1ab76ce410fd599d3a616f47267 100644 (file)
--- a/src/util/flipbase64.c
+++ b/src/util/flipbase64.c
@@ -14,7 +14,6 @@
 
 #include <roken.h>
 
-#if defined(AFS_NAMEI_ENV)
 #include "afsutil.h"
 
 /* This version of base64 gets it right and starts converting from the low
@@ -111,6 +110,3 @@ flipbase64_to_int64(char *s)
     }
     return result;
 }
-
-
-#endif /* AFS_NAMEI_ENV */

diff --git a/src/vfsck/dirutils.c b/src/vfsck/dirutils.c
index 3b1700f0939896fc48a2c6728d6e84c633a87109..ed89f166add856457cd8337c3a7c887e98e229e2 100644 (file)
--- a/src/vfsck/dirutils.c
+++ b/src/vfsck/dirutils.c
@@ -12,6 +12,7 @@
 
 #include <roken.h>
 
+#include <afs/afsint.h>
 #include <afs/ihandle.h>
 #include <afs/partition.h>
 

diff --git a/src/vfsck/setup.c b/src/vfsck/setup.c
index 5a3cd1283afae934bd9c5b9fb60c972e8de33c68..39dcc74b2a2980bbca22097a125b4a2206c3e1a8 100644 (file)
--- a/src/vfsck/setup.c
+++ b/src/vfsck/setup.c
@@ -916,7 +916,7 @@ is_root(rdev_num)
     return (1);
 }
 
-getline(fp, loc, maxlen)
+vfsck_getline(fp, loc, maxlen)
      FILE *fp;
      char *loc;
 {
@@ -947,7 +947,7 @@ freply(s)
     if (!isatty(0))
        errexit("exiting\n");
     printf("\n%s? ", s);
-    if (getline(stdin, line, sizeof(line)) == EOF)
+    if (vfsck_getline(stdin, line, sizeof(line)) == EOF)
        errexit("\n");
     if (line[0] == 'y' || line[0] == 'Y')
        return (1);

diff --git a/src/vol/listinodes.c b/src/vol/listinodes.c
index ad3adcfc71a12c3cb08ac5bfc1aa548bfd2647fe..9deb66b4df4729061b981004a1c79e090484b15d 100644 (file)
--- a/src/vol/listinodes.c
+++ b/src/vol/listinodes.c
@@ -96,6 +96,8 @@ ListViceInodes(char *devname, char *mountedOn, FD_t inodeFile,
 #include <sys/ino.h>
 #endif
 
+#include <rx/rx_queue.h>
+
 #include "lock.h"
 #include "ihandle.h"
 #include "vnode.h"