Remove support for Solaris pre-8

[openafs.git] / src / afs / VNOPS / afs_vnop_fid.c

diff --git a/src/afs/VNOPS/afs_vnop_fid.c b/src/afs/VNOPS/afs_vnop_fid.c
index 9f52a37..d0e26eb 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_fid.c
+++ b/src/afs/VNOPS/afs_vnop_fid.c
@@ -68,7 +68,7 @@ extern int afs_NFSRootOnly;   /* 1 => only allow NFS mounts of /afs. */
 int
 #ifdef AFS_AIX41_ENV
 afs_fid(OSI_VC_DECL(avc), struct fid *fidpp, struct ucred *credp)
-#elif defined(AFS_SUN54_ENV)
+#elif defined(AFS_SUN5_ENV)
 afs_fid(OSI_VC_DECL(avc), struct fid *fidpp)
 #else
 afs_fid(OSI_VC_DECL(avc), struct fid **fidpp)
@@ -76,7 +76,7 @@ afs_fid(OSI_VC_DECL(avc), struct fid **fidpp)
 {
     struct SmallFid Sfid;
     long addr[2];
-    register struct cell *tcell;
+    struct cell *tcell;
     extern struct vcache *afs_globalVp;
     int SizeOfSmallFid = SIZEOF_SMALLFID;
     int rootvp = 0;
@@ -105,7 +105,7 @@ afs_fid(OSI_VC_DECL(avc), struct fid **fidpp)
        if (avc->f.fid.Fid.Unique > 0xffffff)
            afs_fid_uniqueoverflow++;
     } else {
-#if defined(AFS_SUN57_64BIT_ENV) || (defined(AFS_SGI61_ENV) && (_MIPS_SZPTR == 64))
+#if defined(AFS_SUN5_64BIT_ENV) || (defined(AFS_SGI61_ENV) && (_MIPS_SZPTR == 64))
        addr[1] = (long)AFS_XLATOR_MAGIC << 48;
 #else /* defined(AFS_SGI61_ENV) && (_MIPS_SZPTR == 64) */
        addr[1] = AFS_XLATOR_MAGIC;
@@ -114,10 +114,10 @@ afs_fid(OSI_VC_DECL(avc), struct fid **fidpp)
        addr[0] = (long)avc;
 #ifndef AFS_AIX41_ENV
        /* No post processing, so don't hold ref count. */
-       VN_HOLD(AFSTOV(avc));
+       AFS_FAST_HOLD(avc);
 #endif
     }
-#if    defined(AFS_AIX_ENV) || defined(AFS_SUN54_ENV)
+#if    defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV)
     /* Use the fid pointer passed to us. */
     fidpp->fid_len = SizeOfSmallFid;