Unite CacheFetchProcs and add abstraction calls.

[openafs.git] / src / afs / afs_prototypes.h

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 2d29703..b3e1a81 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -491,12 +491,12 @@ extern int afs_MemWritevBlk(register struct memCacheEntry *mceP, int offset,
 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,
                                 afs_size_t * abytesXferredP);
-extern int afs_MemCacheFetchProc(register struct rx_call *acall,
+extern int afs_CacheFetchProc(register struct rx_call *acall,
                                 register struct osi_file *fP,
                                 afs_size_t abase, struct dcache *adc,
                                 struct vcache *avc,
@@ -750,7 +750,7 @@ extern void vcache2fakeinode(struct vcache *rootvp, struct vcache *mpvp);
 #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
@@ -1322,15 +1322,6 @@ extern void afs_ntohuuid(afsUUID * uuidp);
 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