prototypes-fixes-20020821

add externs removed and missed

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

ok, another try. don't include protosw.h here and let sysincludes.h pull it in

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

one more missed extern

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

keep trying...

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

fix weird redefintion problem with kmem_alloc

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

can't know this sort of thing (and it's wrong at least sometimes)

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 7d6396e3cc605b8b109b0cd2ed1092253eac1d94..5b59a8eaf2225248e990fddeff051bc9e3e481f1 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -501,7 +501,17 @@ extern void osi_VM_PreTruncate(struct vcache *avc, int alen, struct AFS_UCRED *a
 
 /* ARCH/osi_vnodeops.c */
 extern struct vnodeops Afs_vnodeops;
-
+#if defined(AFS_OSF_ENV)
+#if defined(AFS_OSF30_ENV)
+extern int max_vnodes;                  /* number of total system vnodes */
+#else
+extern int nvnode;                      /* number of total system vnodes */
+extern int numvnodes;                   /* number vnodes in use now */ 
+#endif 
+#ifdef AFS_DUX40_ENV
+extern struct vfs_ubcops afs_ubcops;
+#endif
+#endif
 
 /* afs_osifile.c */
 

diff --git a/src/libadmin/adminutil/afs_utilAdmin.h b/src/libadmin/adminutil/afs_utilAdmin.h
index 5be74dbde640bdd35f3117d771b44acd97ee91ee..71fa70577ff3a8b7fcd0f6c8867db5b1a63def21 100644 (file)
--- a/src/libadmin/adminutil/afs_utilAdmin.h
+++ b/src/libadmin/adminutil/afs_utilAdmin.h
@@ -61,7 +61,7 @@ extern int ADMINAPI CellHandleIsValid(
 
 extern int ADMINAPI util_RPCStatsGetBegin(
   struct rx_connection *conn,
-  int (*rpc)(struct rx_call *call),
+  int (*rpc)(),
   void **iterationIdP,
   afs_status_p st
 );
@@ -79,26 +79,26 @@ extern int ADMINAPI util_RPCStatsGetDone(
 
 extern int ADMINAPI util_RPCStatsStateGet(
   struct rx_connection *conn,
-  int (*rpc)(struct rx_call *call),
+  int (*rpc)(),
   afs_RPCStatsState_p state,
   afs_status_p st
 );
 
 extern int ADMINAPI util_RPCStatsStateEnable(
   struct rx_connection *conn,
-  int (*rpc)(struct rx_call *call),
+  int (*rpc)(),
   afs_status_p st
 );
 
 extern int ADMINAPI util_RPCStatsStateDisable(
   struct rx_connection *conn,
-  int (*rpc)(struct rx_call *call),
+  int (*rpc)(),
   afs_status_p st
 );
 
 extern int ADMINAPI util_RPCStatsClear(
   struct rx_connection *conn,
-  int (*rpc)(struct rx_call *call),
+  int (*rpc)(),
   afs_RPCStatsClearFlag_t flag,
   afs_status_p st
 );

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index d50ba4123eeef1823917bf38bb7a268b4585a517..f6ef47f96dd279920e18f0fb7f91b21ce89ce2d0 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -35,7 +35,6 @@ typedef unsigned short                  etap_event_t;
 #include "../h/socket.h"
 #ifndef AFS_LINUX22_ENV
 #include "../h/socketvar.h"
-#include "../h/protosw.h"
 #if !defined(AFS_SUN5_ENV) && !defined(AFS_XBSD_ENV)
 #include "../h/domain.h"
 #include "../h/dir.h"
@@ -90,7 +89,7 @@ struct coda_inode_info {};
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
 #include "../netinet/in_var.h"
 #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
-#ifndef AFS_LINUX22_ENV
+#if !defined(AFS_LINUX22_ENV) && !defined(AFS_DUX40_ENV) 
 #include "../rpc/types.h"
 #endif
 #include "../afs/afs_osi.h"
@@ -103,6 +102,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