prototypes-fixes-20020821

hopefully last of the lwp fun

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

make it build on the bsds

====================

nope. this time for sure (more lwp createprocess casting)

====================

clean up osi_UFSOpen prototyping

====================

aix gets bitter at this

====================

fix missed argument

====================

again, aix doesn't like this. so, we don't do it

====================

yup, aix still hates this

====================

dux compiler doesn't like this (i think this one is actually my fault)

====================

already prototyped in rxkad_prototypes.h

====================
causes multiple inclusion of protosw.h which isn't safe on irix.

====================

for some reason you just can't declare the same thing the same way twice

====================

make dux compiler happy. oops.

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index c48f1c2..f6204e7 100644 (file)
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -276,7 +276,7 @@ afs_vop_open(ap)
        panic("AFS open changed vnode!");
 #endif
     afs_BozonLock(&vc->pvnLock, vc);
-    osi_FlushPages(vc);
+    osi_FlushPages(vc, ap->a_cred);
     afs_BozonUnlock(&vc->pvnLock, vc);
     AFS_GUNLOCK();
     return error;
@@ -299,7 +299,7 @@ afs_vop_close(ap)
     else
         code=afs_close(avc, ap->a_fflag, &afs_osi_cred, ap->a_p);
     afs_BozonLock(&avc->pvnLock, avc);
-    osi_FlushPages(avc);        /* hold bozon lock, but not basic vnode lock */
+    osi_FlushPages(avc, ap->a_cred);        /* hold bozon lock, but not basic vnode lock */
     afs_BozonUnlock(&avc->pvnLock, avc);
     AFS_GUNLOCK();
     return code;
@@ -363,7 +363,7 @@ afs_vop_read(ap)
     struct vcache *avc=VTOAFS(ap->a_vp);
     AFS_GLOCK();
     afs_BozonLock(&avc->pvnLock, avc);
-    osi_FlushPages(avc);        /* hold bozon lock, but not basic vnode lock */
+    osi_FlushPages(avc, ap->a_cred);        /* hold bozon lock, but not basic vnode lock */
     code=afs_read(avc, ap->a_uio, ap->a_cred, 0, 0, 0);
     afs_BozonUnlock(&avc->pvnLock, avc);
     AFS_GUNLOCK();
@@ -425,7 +425,7 @@ afs_vop_getpages(ap)
     uio.uio_procp=curproc;
     AFS_GLOCK();
     afs_BozonLock(&avc->pvnLock, avc);
-    osi_FlushPages(avc);        /* hold bozon lock, but not basic vnode lock */
+    osi_FlushPages(avc, curproc->p_cred->pc_ucred);  /* hold bozon lock, but not basic vnode lock */
     code=afs_read(avc, &uio, curproc->p_cred->pc_ucred, 0, 0, 0);
     afs_BozonUnlock(&avc->pvnLock, avc);
     AFS_GUNLOCK();
@@ -503,7 +503,7 @@ afs_vop_write(ap)
     struct vcache *avc=VTOAFS(ap->a_vp);
     AFS_GLOCK();
     afs_BozonLock(&avc->pvnLock, avc);
-    osi_FlushPages(avc);        /* hold bozon lock, but not basic vnode lock */
+    osi_FlushPages(avc, ap->a_cred);        /* hold bozon lock, but not basic vnode lock */
     code=afs_write(VTOAFS(ap->a_vp), ap->a_uio, ap->a_ioflag, ap->a_cred, 0);
     afs_BozonUnlock(&avc->pvnLock, avc);
     AFS_GUNLOCK();

diff --git a/src/afs/IRIX/osi_file.c b/src/afs/IRIX/osi_file.c
index fb6e496..ac4bddf 100644 (file)
--- a/src/afs/IRIX/osi_file.c
+++ b/src/afs/IRIX/osi_file.c
@@ -17,7 +17,6 @@ RCSID("$Header$");
 #include "../afs/afs_stats.h"  /* afs statistics */
 
 int afs_osicred_initialized=0;
-struct  AFS_UCRED afs_osi_cred;
 afs_lock_t afs_xosi;           /* lock is for tvattr */
 extern struct osi_dev cacheDev;
 extern struct vfs *afs_cacheVfsp;

diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h
index e0057fd..0e403da 100644 (file)
--- a/src/afs/UKERNEL/sysincludes.h
+++ b/src/afs/UKERNEL/sysincludes.h
@@ -1329,13 +1329,14 @@ struct min_direct {
 #ifndef NOGROUP
 #define NOGROUP                        (-1)
 #endif
+#ifdef cr_gid
+#undef cr_gid
+#endif
 
 struct usr_ucred {
        unsigned long           cr_ref;
        long                    cr_uid;
-#if !defined(AFS_USR_FBSD_ENV) && !defined(AFS_USR_DARWIN60_ENV)
        long                    cr_gid;
-#endif
        long                    cr_ruid;
        long                    cr_rgid;
        long                    cr_suid;

diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c
index 19cc82d..4472298 100644 (file)
--- a/src/afs/afs_dcache.c
+++ b/src/afs/afs_dcache.c
@@ -1798,22 +1798,22 @@ RetryLookup:
        overWriteWholeChunk = 1;
     if (doAdjustSize || overWriteWholeChunk) {
 #if    defined(AFS_AIX32_ENV) || defined(AFS_SGI_ENV)
- #ifdef        AFS_SGI_ENV
-  #ifdef AFS_SGI64_ENV
+#ifdef AFS_SGI_ENV
+#ifdef AFS_SGI64_ENV
         if (doAdjustSize) adjustsize = NBPP;
-  #else /* AFS_SGI64_ENV */
-        if (doAdjustSize) adjustsize = 8192;
-  #endif /* AFS_SGI64_ENV */
- #else /* AFS_SGI_ENV */
+#else /* AFS_SGI64_ENV */
+       if (doAdjustSize) adjustsize = 8192;
+#endif /* AFS_SGI64_ENV */
+#else /* AFS_SGI_ENV */
         if (doAdjustSize) adjustsize = 4096;
- #endif /* AFS_SGI_ENV */
+#endif /* AFS_SGI_ENV */
         if (AFS_CHUNKTOBASE(chunk)+adjustsize >= avc->m.Length &&
 #else /* defined(AFS_AIX32_ENV) || defined(AFS_SGI_ENV) */
- #if   defined(AFS_SUN_ENV)  || defined(AFS_OSF_ENV)
+#if    defined(AFS_SUN_ENV)  || defined(AFS_OSF_ENV)
         if ((doAdjustSize || (AFS_CHUNKTOBASE(chunk) >= avc->m.Length)) &&
- #else
+#else
         if (AFS_CHUNKTOBASE(chunk) >= avc->m.Length &&
- #endif
+#endif
 #endif /* defined(AFS_AIX32_ENV) || defined(AFS_SGI_ENV) */
        !hsame(avc->m.DataVersion, tdc->f.versionNo))
            doReallyAdjustSize = 1;

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 8c81637..9f5b70b 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -458,7 +458,7 @@ extern int afs_osi_SleepSig(void *event);
 
 /* ARCH/osi_file.c */
 extern int afs_osicred_initialized;
-#if defined(AFS_SUN57_64BIT_ENV)
+#if defined(AFS_SUN57_64BIT_ENV) || defined(AFS_SGI62_ENV)
 extern void *osi_UFSOpen(ino_t ainode);
 #else
 extern void *osi_UFSOpen(afs_int32 ainode);
@@ -495,11 +495,6 @@ extern struct vnodeops Afs_vnodeops;
 
 
 /* afs_osifile.c */
-#ifdef AFS_SGI62_ENV
-extern void *osi_UFSOpen(ino_t);
-#else
-extern void *osi_UFSOpen();
-#endif
 
 /* afs_osi_pag.c */
 extern afs_uint32 pag_epoch;

diff --git a/src/auth/ktc.c b/src/auth/ktc.c
index 7a3d6f5..b304e5a 100644 (file)
--- a/src/auth/ktc.c
+++ b/src/auth/ktc.c
@@ -80,8 +80,6 @@ RCSID("$Header$");
 #ifdef AFS_KERBEROS_ENV 
 #include <fcntl.h>
 #include <sys/file.h>
-extern afs_uint32 life_to_time();
-extern unsigned char time_to_life();
 #include "cellconfig.h"
 static char lcell[MAXCELLCHARS];
  

diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c
index c616375..2beca24 100644 (file)
--- a/src/butc/tcmain.c
+++ b/src/butc/tcmain.c
@@ -1086,7 +1086,8 @@ char *arock; {
     code = pthread_create(&dbWatcherPid, &tattr, dbWatcher, (void *)2);
     AFS_SIGSET_RESTORE();
 #else
-    code = LWP_CreateProcess(dbWatcher, 20480, LWP_NORMAL_PRIORITY, 2, "dbWatcher", &dbWatcherPid);
+    code = LWP_CreateProcess(dbWatcher, 20480, LWP_NORMAL_PRIORITY, 
+                            (void *) 2, "dbWatcher", &dbWatcherPid);
 #endif
     if (code)
     {

diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c
index f5844d2..49dafba 100644 (file)
--- a/src/butc/tcprocs.c
+++ b/src/butc/tcprocs.c
@@ -127,7 +127,8 @@ afs_int32 STC_LabelTape(acid, label, taskId)
     code = pthread_create(&pid, &tattr, Labeller, ptr);
     AFS_SIGSET_RESTORE();
 #else
-    code = LWP_CreateProcess(Labeller, 32768, 1, ptr ,"labeller process", &pid);
+    code = LWP_CreateProcess(Labeller, 32768, 1, (void *) ptr,
+                            "labeller process", &pid);
 #endif
 
 error_exit:
@@ -221,7 +222,8 @@ afs_int32 STC_PerformDump(rxCallId, tcdiPtr, tc_dumpArrayPtr, taskId)
     code = pthread_create(&pid, &tattr, Dumper, newNode);
     AFS_SIGSET_RESTORE();
 #else
-    code = LWP_CreateProcess(Dumper, 32768, 1, newNode, "dumper process", &pid);
+    code = LWP_CreateProcess(Dumper, 32768, 1, (void *) newNode, 
+                            "dumper process", &pid);
 #endif
     if (code) ERROR_EXIT(code);
 
@@ -298,7 +300,8 @@ afs_int32 STC_PerformRestore(acid, dumpSetName, arestores, taskID)
     code = pthread_create(&pid, &tattr, Restorer, newNode);
     AFS_SIGSET_RESTORE();
 #else
-    code = LWP_CreateProcess(Restorer, 65368, 1,newNode ,"restorer process", &pid);
+    code = LWP_CreateProcess(Restorer, 65368, 1, (void *) newNode, 
+                            "restorer process", &pid);
 #endif
 
 error_exit:
@@ -384,7 +387,8 @@ afs_int32 STC_RestoreDb(rxCall, taskId)
     code = pthread_create(&pid, &tattr, restoreDbFromTape, (void *)*taskId);
     AFS_SIGSET_RESTORE();
 #else
-    code = LWP_CreateProcess(restoreDbFromTape, 32768, 1, *taskId, "Db restore", &pid);
+    code = LWP_CreateProcess(restoreDbFromTape, 32768, 1, 
+                            (void *)*taskId, "Db restore", &pid);
 #endif
 
 error_exit:

diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c
index 348f315..10fcb28 100644 (file)
--- a/src/butc/tcudbprocs.c
+++ b/src/butc/tcudbprocs.c
@@ -910,7 +910,7 @@ writeDbDump(tapeInfoPtr, taskId, expires, dumpid)
                code = pthread_create(&alivePid, &tattr, KeepAlive, 0);
                AFS_SIGSET_RESTORE();
 #else
-               code = LWP_CreateProcess(KeepAlive, 16384, 1, NULL, 
+               code = LWP_CreateProcess(KeepAlive, 16384, 1, (void *) NULL, 
                                         "Keep-alive process", &alivePid);
 #endif
                /* XXX should we check code here ??? XXX */

diff --git a/src/rx/IRIX/rx_knet.c b/src/rx/IRIX/rx_knet.c
index c6abbaf..e60681b 100644 (file)
--- a/src/rx/IRIX/rx_knet.c
+++ b/src/rx/IRIX/rx_knet.c
@@ -104,7 +104,7 @@ int osi_NetReceive(osi_socket so, struct sockaddr_in *addr, struct iovec *dvec,
     else {
        *alength = *alength - tuio.uio_resid;
        if (maddr) {
-           memcpy((char*)from, (char*)mtod(maddr, struct sockaddr_in *),
+           memcpy((char*)addr, (char*)mtod(maddr, struct sockaddr_in *),
                  sizeof(struct sockaddr_in));
            m_freem(maddr);
        }

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 63221e3..d50ba41 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -103,7 +103,6 @@ struct coda_inode_info {};
 #include "../afs/afs_stats.h"
 #include "../h/errno.h"
 #ifdef KERNEL
-#include "../afs/sysincludes.h"
 #include "../afs/afsincludes.h"
 #endif
 

diff --git a/src/rx/xdr.h b/src/rx/xdr.h
index 3b2dbe7..b52fef9 100644 (file)
--- a/src/rx/xdr.h
+++ b/src/rx/xdr.h
@@ -43,8 +43,10 @@
 #include <winsock2.h>
 #endif /* _MFC_VER */
 #endif
+#ifndef bool_t
 #define        bool_t  int
 #define        enum_t  int
+#endif
 #ifndef FALSE
 #define        FALSE   0
 #endif /* !FALSE */

diff --git a/src/rx/xdr_int32.c b/src/rx/xdr_int32.c
index 1340dbd..de58026 100644 (file)
--- a/src/rx/xdr_int32.c
+++ b/src/rx/xdr_int32.c
@@ -38,7 +38,7 @@ RCSID("$Header$");
 
 #ifndef        NeXT
 
-#ifdef KERNEL
+#if defined(KERNEL) && !defined(UKERNEL)
 #include <sys/param.h>
 #else
 #include <stdio.h>

diff --git a/src/sys/afssyscalls.h b/src/sys/afssyscalls.h
index e259063..2b0bb12 100644 (file)
--- a/src/sys/afssyscalls.h
+++ b/src/sys/afssyscalls.h
@@ -15,22 +15,22 @@
 /* Declare Inode type. */
 #include <afs/param.h>
 #ifdef AFS_NAMEI_ENV
- #include <sys/types.h>
- #if AFS_64BIT_ENV
-   typedef afs_uint64 Inode;
- #else
-   typedef u_int64_t Inode;
- #endif
+#include <sys/types.h>
+#if AFS_64BIT_ENV
+typedef afs_uint64 Inode;
+#else
+typedef u_int64_t Inode;
+#endif
 #else /* AFS_NAMEI_ENV */
- #ifdef AFS_64BIT_IOPS_ENV
-  #ifdef AFS_SGI62_ENV
-   typedef uint64_t Inode;
-  #else
-   error Need 64 bit Inode defined.
-  #endif /* AFS_SGI62_ENV */
- #else /* AFS_64BIT_IOPS_ENV */
-  typedef unsigned int Inode;
- #endif
+#ifdef AFS_64BIT_IOPS_ENV
+#ifdef AFS_SGI62_ENV
+typedef uint64_t Inode;
+#else
+error Need 64 bit Inode defined.
+#endif /* AFS_SGI62_ENV */
+#else /* AFS_64BIT_IOPS_ENV */
+typedef unsigned int Inode;
+#endif
 
 #ifdef AFS_DEBUG_IOPS
 extern FILE *inode_debug_log;

diff --git a/src/venus/fs.c b/src/venus/fs.c
index 85ef769..23092cb 100644 (file)
--- a/src/venus/fs.c
+++ b/src/venus/fs.c
@@ -49,7 +49,6 @@ RCSID("$Header$");
 #include <afs/volser.h>
 #include <afs/vlserver.h>
 #include <afs/cmd.h>
-#include <strings.h>
 #include <afs/afsutil.h>
 #include <stdlib.h>
 #include <assert.h>

diff --git a/src/venus/livesys.c b/src/venus/livesys.c
index cb40759..69912cd 100644 (file)
--- a/src/venus/livesys.c
+++ b/src/venus/livesys.c
@@ -34,7 +34,6 @@ RCSID("$Header$");
 #ifdef AFS_AIX32_ENV
 #include <signal.h>
 #endif
-#include <strings.h>
 
 #define        MAXSIZE 2048
 static char space[MAXSIZE];

diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c
index 4f0a618..4ee584d 100644 (file)
--- a/src/vlserver/cnvldb.c
+++ b/src/vlserver/cnvldb.c
@@ -34,7 +34,6 @@ RCSID("$Header$");
 #include <afs/fileutil.h>
 
 #include "vlserver.h"
-#include <strings.h>
 
 #define MAXSIZE 2048 /* most I'll get back from PIOCTL */
 #define        BADSERVERID     255     /* XXX */