/* afs_buffer.c */
extern void DInit(int abuffers);
extern void *DRead(register struct dcache * fid, register int page);
-extern void DRelease(register struct buffer *bp, int flag);
extern int DVOffset(register void *ap);
extern void DZap(struct dcache * fid);
extern void DFlush(void);
extern struct afs_exporter *exporter_find(int type);
extern void shutdown_exporter(void);
+/* afs_fetchstore.c */
+extern int afs_UFSCacheFetchProc(struct rx_call *, struct osi_file *,
+ afs_size_t, struct dcache *,
+ struct vcache *, afs_size_t *,
+ afs_size_t *, afs_int32);
+
+extern int afs_UFSCacheStoreProc(struct rx_call *, struct osi_file *,
+ afs_int32, struct vcache *,
+ int *, afs_size_t *,
+ afs_size_t *);
+
/* afs_icl.c */
extern struct afs_icl_set *afs_icl_allSets;
extern int afs_icl_InitLogs(void);
extern int afs_MemWriteUIO(afs_dcache_id_t *ainode, struct uio *uioP);
extern int afs_MemCacheTruncate(register struct osi_file *fP,
int size);
-extern int afs_MemCacheStoreProc(register struct rx_call *acall,
+extern int afs_CacheStoreProc(register struct rx_call *acall,
register struct osi_file *fP,
register afs_int32 alen, struct vcache *avc,
int *shouldWake, afs_size_t * abytesToXferP,
extern int AddPag(afs_int32 aval, struct AFS_UCRED **credpp);
#endif
extern int afs_InitReq(register struct vrequest *av, struct AFS_UCRED *acred);
-#if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
+#if defined(UKERNEL)
extern afs_uint32 afs_get_pag_from_groups(gid_t g0a, gid_t g1a);
#else
#ifdef AFS_LINUX26_ONEGROUP_ENV
#endif
#ifdef UKERNEL
-extern int afs_mount(struct vfs *path, char *data, struct vfs *afsp);
+extern int afs_mount(struct vfs *afsp, char *path, void *data);
extern int afs_root(OSI_VFS_DECL(afsp), struct vnode **avpp);
extern int afs_unmount(struct vfs *afsp);
#endif
/* afs_syscall.c */
extern int copyin_afs_ioctl(caddr_t cmarg, struct afs_ioctl *dst);
-
+#ifdef UKERNEL
+extern int Afs_syscall(void);
+#endif
/* UKERNEL/afs_usrops.c */
#ifdef UKERNEL
char *postamble, int flag);
extern afs_int32 afs_data_pointer_to_int32(const void *p);
-#if 0 /* problems - need to change to varargs, right now is incorrect usage
- * throughout code */
-extern void afs_warn(char *a, long b, long c, long d, long e, long f, long g,
- long h, long i, long j);
-extern void afs_warnuser(char *a, long b, long c, long d, long e, long f,
- long g, long h, long i, long j);
-#else
-extern void afs_warn();
-extern void afs_warnuser();
-#endif
extern void afs_CheckLocks(void);
extern int afs_badop(void);
extern int afs_noop(void);
extern afs_int32 afs_data_pointer_to_int32(const void *p);
+/* afs_warn.c */
+#ifdef AFS_AIX_ENV
+/* AIX doesn't have usable va_args support in its kernel */
+extern void afs_warn();
+extern void afs_warnuser();
+#else
+extern void afs_warn(char *fmt, ...);
+extern void afs_warnuser(char *fmt, ...);
+#endif
/* afs_vcache.c */
extern int afs_ShakeLooseVCaches(afs_int32 anumber);
extern afs_int32 afs_uuid_create(afsUUID * uuid);
extern u_short afs_uuid_hash(afsUUID * uuid);
-
-/* MISC PROTOTYPES - THESE SHOULD NOT BE HERE */
-/* MOVE THEM TO APPROPRIATE LOCATIONS */
-extern afs_int32 RXAFSCB_ExecuteRequest(struct rx_call *acall);
-extern afs_int32 RXSTATS_ExecuteRequest(struct rx_call *acall);
-extern afs_int32 PAGCB_ExecuteRequest(struct rx_call *acall);
-
-
-
#if defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_AIX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_SGI62_ENV) || defined(AFS_OSF_ENV)
#include "osi_prototypes.h"
#endif