From: Andrew Deason <adeason@sinenomine.net>
Date: Tue, 11 Jun 2013 19:40:30 +0000 (-0500)
Subject: Make the inode fileserver backend build again
X-Git-Tag: openafs-stable-1_8_0pre1~1119
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=43439f6312bc8f631d3eb1e28282730aac47b0eb

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 013574f..169255a 100644
--- 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 b969ab2..71afc3f 100644
--- 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 7498a3d..ce873bb 100644
--- 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 3b1700f..ed89f16 100644
--- 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 5a3cd12..39dcc74 100644
--- 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 ad3adcf..9deb66b 100644
--- 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"