prototypes-fixes-20020821

fix the following problems
- including osi_vfs.h on almost all platforms, even though afsincludes.h
already deals with it
- universally declaring afs_globalVFS as a struct vfs *
- declaring afs_stats_XferSumBytes in a header without a storage class
- using afsincludes.h without sysincludes.h
- make clean removes a source file in rxkad

====================
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.
====================

irix needs this, put it back

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

cast parm argument to CreateProcess

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

more lwp createprocess fun

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

more lwp

diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c
index dcc38d2..b52953c 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_flock.c
+++ b/src/afs/VNOPS/afs_vnop_flock.c
@@ -463,7 +463,6 @@ afs_lockctl(struct vcache *avc, struct eflock *af, int flag,
 #else
 #if defined(AFS_SGI_ENV) || (defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV)) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
 afs_lockctl(struct vcache *avc, struct AFS_FLOCK *af, int acmd, struct AFS_UCRED *acred, pid_t clid)
-pid_t clid;
 #else
 u_int clid=0;
 afs_lockctl(struct vcache *avc, struct AFS_FLOCK *af, int acmd, struct AFS_UCRED *acred)

diff --git a/src/afs/afs_buffer.c b/src/afs/afs_buffer.c
index 83eb87e..8528c21 100644 (file)
--- a/src/afs/afs_buffer.c
+++ b/src/afs/afs_buffer.c
@@ -34,10 +34,6 @@ RCSID("$Header$");
 #include "../h/buf.h"
 #endif /* !defined(UKERNEL) */
 
-#if !defined(UKERNEL) && defined(AFS_LINUX20_ENV)
-#include "../afs/osi_vfs.h"
-#endif
-
 #include "../afs/stds.h"
 #include "../afs/volerrors.h"
 #include "../afs/exporter.h"

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 51be67c..5eab8c8 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -508,9 +508,15 @@ extern afs_uint32 pag_epoch;
 extern afs_uint32 pagCounter;
 
 /* OS/osi_vfsops.c */
+#if defined(AFS_OSF_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV)
+extern struct mount *afs_globalVFS;
+#else
 extern struct vfs *afs_globalVFS;
+#endif
 extern struct vcache *afs_globalVp;
+#ifdef AFS_LINUX20_ENV
 extern void vcache2inode(struct vcache *avc);
+#endif
 
 /* afs_pioctl.c */
 extern struct VenusFid afs_rootFid;
@@ -578,7 +584,7 @@ extern int osi_dnlc_shutdown(void);
 extern struct afs_CMStats afs_cmstats;
 extern struct afs_stats_CMPerf afs_stats_cmperf;
 extern struct afs_stats_CMFullPerf afs_stats_cmfullperf;
-afs_int32 afs_stats_XferSumBytes[AFS_STATS_NUM_FS_XFER_OPS];
+extern afs_int32 afs_stats_XferSumBytes[AFS_STATS_NUM_FS_XFER_OPS];
 extern void afs_InitStats(void);
 extern int afs_GetCMStat(char **ptr, unsigned *size);
 #ifndef AFS_NOSTATS

diff --git a/src/bucoord/bc_status.c b/src/bucoord/bc_status.c
index f777992..5182b7a 100644 (file)
--- a/src/bucoord/bc_status.c
+++ b/src/bucoord/bc_status.c
@@ -224,7 +224,8 @@ statusWatcher()
                printf("Starting scheduled dump: job %d\n", jobNumber);
                printf("schedD> %s\n", cmdLine);
 
-               code = LWP_CreateProcess(cmdDispatch, 16384, LWP_NORMAL_PRIORITY, 2,
+               code = LWP_CreateProcess(cmdDispatch, 16384, 
+                                        LWP_NORMAL_PRIORITY, (void *) 2,
                                         "cmdDispatch", &dispatchPid);
                if ( code )
                {

diff --git a/src/bucoord/dump.c b/src/bucoord/dump.c
index 1be89e9..a13487e 100644 (file)
--- a/src/bucoord/dump.c
+++ b/src/bucoord/dump.c
@@ -302,7 +302,8 @@ bc_StartDmpRst(aconfig, adname, avname, avolsToDump, adestServer, adestPartition
     else
         memset(&bc_dumpTasks[i].destServer, 0, sizeof(struct sockaddr_in));
  
-    code = LWP_CreateProcess(bc_DmpRstStart, 20480, LWP_NORMAL_PRIORITY, i, "helper", &junk);
+    code = LWP_CreateProcess(bc_DmpRstStart, 20480, LWP_NORMAL_PRIORITY, 
+                            (void *)i, "helper", &junk);
     if (code)
     {
        bc_HandleMisc(code);

diff --git a/src/bucoord/main.c b/src/bucoord/main.c
index ac8dc9e..5926907 100644 (file)
--- a/src/bucoord/main.c
+++ b/src/bucoord/main.c
@@ -277,8 +277,8 @@ static int backupInit()
 
     /* setup status monitoring thread */
     initStatus();
-    code = LWP_CreateProcess(statusWatcher, 20480, LWP_NORMAL_PRIORITY, 2,
-                             "statusWatcher", &watcherPid);
+    code = LWP_CreateProcess(statusWatcher, 20480, LWP_NORMAL_PRIORITY, 
+                            (void *)2, "statusWatcher", &watcherPid);
     if ( code )
     {
        com_err(whoami, code, "; Can't create status monitor task");

diff --git a/src/budb/dbs_dump.c b/src/budb/dbs_dump.c
index 8140a23..bcb49e8 100644 (file)
--- a/src/budb/dbs_dump.c
+++ b/src/budb/dbs_dump.c
@@ -152,7 +152,8 @@ afs_int32 DumpDB (call, firstcall, maxLength, charListPtr, done)
        code = pipe(dumpSyncPtr->pipeFid);
        if (code) ERROR(errno);
        
-       code = LWP_CreateProcess(setupDbDump, 16384, 1, dumpSyncPtr->pipeFid[1],
+       code = LWP_CreateProcess(setupDbDump, 16384, 1, 
+                                (void *) dumpSyncPtr->pipeFid[1],
                                 "Database Dumper", &dumperPid);
        if (code) goto error_exit;
 

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index d50ba41..63221e3 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -103,6 +103,7 @@ 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/rxkad/Makefile.in b/src/rxkad/Makefile.in
index 5c0d565..279eeac 100644 (file)
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -205,7 +205,7 @@ fc_test.o: ${INCLS}
 #
 
 clean: 
-       $(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h rxkad_prototypes.h \
+       $(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \
                AFS_component_version_number.c \
                crypt_conn.c fcrypt.c fcrypt.h sboxes.h \
                fc_test

diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index d1f1b11..354b0cd 100644 (file)
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -166,6 +166,9 @@ RCSID("$Header$");
 #endif
 #endif
 #include <fcntl.h>
+#ifndef AFS_NT40_ENV
+#include <afs/osi_inode.h>
+#endif
 #include <afs/cmd.h>
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>