From f310da48b4ccc2e63379d194364057a5ed1fedec Mon Sep 17 00:00:00 2001
From: Hartmut Reuter <reuter@rzg.mpg.de>
Date: Mon, 5 Mar 2001 16:39:05 +0000
Subject: [PATCH] support-namei-fileserver-on-solaris8-20010305

So the namei fileserver can be used on Solaris 8
---
 src/afs/SOLARIS/osi_vnodeops.c | 4 ----
 src/config/param.sun4x_58.h    | 7 ++++++-
 src/sys/afssyscalls.h          | 8 ++++++++
 src/vol/partition.c            | 4 ++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/afs/SOLARIS/osi_vnodeops.c b/src/afs/SOLARIS/osi_vnodeops.c
index e55d269..4e4d8ef 100644
--- a/src/afs/SOLARIS/osi_vnodeops.c
+++ b/src/afs/SOLARIS/osi_vnodeops.c
@@ -560,10 +560,6 @@ int afs_putpage(vp, off, len, flags, cred)
     /*
      * Putpage (ASYNC) is called every sec to flush out dirty vm pages 
      */
-    if (flags == B_ASYNC) {
-	/* XXX For testing only XXX */
-	return (EINVAL);
-    }
     AFS_GLOCK();
     afs_Trace4(afs_iclSetp, CM_TRACE_PAGEOUT, ICL_TYPE_POINTER, (afs_int32) vp,
 	       ICL_TYPE_LONG, (afs_int32) off, ICL_TYPE_LONG, (afs_int32) len,
diff --git a/src/config/param.sun4x_58.h b/src/config/param.sun4x_58.h
index b818510..fbee6f7 100644
--- a/src/config/param.sun4x_58.h
+++ b/src/config/param.sun4x_58.h
@@ -19,13 +19,18 @@
 
 #define AFS_64BIT_ENV		1       /* Defines afs_int32 as int, not long. */
 
+#ifdef AFS_NAMEI_ENV
+#define AFS_64BIT_IOPS_ENV     1       /* needed for NAMEI... */
+#else /* AFS_NAMEI_ENV */
+#define AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
+#endif /* AFS_NAMEI_ENV */
+
 #include <afs/afs_sysnames.h>
 
 #define AFS_GLOBAL_SUNLOCK	1	/* For global locking */
 #define RXK_LISTENER_ENV   1
 #define AFS_GCPAGS		1       /* if nonzero, garbage collect PAGs */
 
-#define	AFS_3DISPARES		1	/* Utilize the 3 available disk inode 'spares' */
 #define	AFS_SYSCALL		65
 
 /* File system entry (used if mount.h doesn't define MOUNT_AFS */
diff --git a/src/sys/afssyscalls.h b/src/sys/afssyscalls.h
index 97fe5f0..7ad6332 100644
--- a/src/sys/afssyscalls.h
+++ b/src/sys/afssyscalls.h
@@ -22,7 +22,15 @@ typedef uint64_t Inode;
 #else
 #ifdef AFS_NAMEI_ENV
 #include <sys/types.h>
+#ifdef AFS_NEC_SX92_ENV
+typedef unsigned long Inode;
+#else /* AFS_NEC_SX92_ENV */
+#ifdef AFS_64BIT_ENV
+typedef afs_uint64 Inode;
+#else
 typedef u_int64_t Inode;
+#endif
+#endif /* AFS_NEC_SX92_ENV */
 #else
 error Need 64 bit Inode defined.
 #endif /* AFS_NAMEI_ENV */
diff --git a/src/vol/partition.c b/src/vol/partition.c
index 9e3ad50..2a0d960 100644
--- a/src/vol/partition.c
+++ b/src/vol/partition.c
@@ -179,7 +179,11 @@ static void VInitPartition_r(char *path, char *devname, Device dev)
     dp->next = 0;
     strcpy(dp->name, path);
 #if defined(AFS_NAMEI_ENV) && !defined(AFS_NT40_ENV)
+#ifdef AFS_SUN5_ENV
+    strcpy(dp->devName, devname);
+#else /* AFS_SUN5_ENV */
     strcpy(dp->devName, path);
+#endif
     dp->device = volutil_GetPartitionID(path);
 #else
     strcpy(dp->devName, devname);
-- 
1.9.4