linux-ifdef-stupidity-cleanup-20030117

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

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 1b42071..09c16f0 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -89,7 +89,7 @@ extern int afs_icl_Event1(register struct afs_icl_set *setp, afs_int32 eventID,
        afs_int32 lAndT, long p1);
 extern int afs_icl_Event0(register struct afs_icl_set *setp, afs_int32 eventID, 
        afs_int32 lAndT);
-extern int afs_icl_AppendRecord(register struct afs_icl_log *logp, afs_int32 op, 
+extern void afs_icl_AppendRecord(register struct afs_icl_log *logp, afs_int32 op, 
        afs_int32 types, long p1, long p2, long p3, long p4);
 
 extern int afs_CheckInit(void);
@@ -173,6 +173,7 @@ extern int afs_CellOrAliasExists(char *aname);
 extern int afs_CellNumValid(afs_int32 cellnum);
 extern afs_int32 afs_NewCellAlias(char *alias, char *cell);
 extern struct cell_alias *afs_GetCellAlias(int index);
+extern void afs_PutCellAlias(struct cell_alias *a);
 extern int afs_AFSDBHandler(char *acellName, int acellNameLen,
        afs_int32 *kernelMsg);
 extern void afs_LookupAFSDB(char *acellName);
@@ -308,6 +309,8 @@ extern int afs_CacheInit(afs_int32 astatSize, afs_int32 afiles, afs_int32
         afs_int32 aflags, afs_int32 ninodes, afs_int32 nusers);
 extern void afs_ComputeCacheParms(void);
 extern int afs_InitCacheInfo(register char *afile);
+extern int afs_InitVolumeInfo(char *afile);
+extern int afs_InitCellInfo(char *afile);
 extern int afs_ResourceInit(int preallocs);
 extern void shutdown_cache(void);
 extern void shutdown_vnodeops(void);
@@ -349,8 +352,7 @@ extern void shutdown_mariner(void);
 
 
 /* afs_memcache.c */
-extern void *afs_MemCacheOpen(ino_t blkno);
-extern int afs_InitMemCache(int size, int blkSize, int flags);
+extern int afs_InitMemCache(int blkCount, int blkSize, int flags);
 extern int afs_MemCacheClose(char *file);
 extern void *afs_MemCacheOpen(ino_t blkno);
 extern int afs_MemReadBlk(register struct memCacheEntry *mceP, int offset, char *dest, int size);
@@ -403,6 +405,7 @@ extern const struct AFS_UCRED *afs_osi_proc2cred(AFS_PROC *pr);
 #endif
 
 /* afs_osi_pag.c */
+extern int afs_setpag();
 extern afs_uint32 genpag(void);
 extern afs_uint32 getpag(void);
 #if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
@@ -429,6 +432,11 @@ extern void *osi_AllocSmallSpace(size_t size);
 extern char *osi_AllocSmall(register afs_int32 size, register afs_int32 morespace);
 #endif
 
+/* afs_osi_uio.c */
+extern int afsio_copy(struct uio *ainuio, struct uio *aoutuio, struct iovec *aoutvec);
+extern int afsio_trim(struct uio *auio, afs_int32 asize);
+extern int afsio_skip(struct uio *auio, afs_int32 asize);
+
 
 
 /* ARCH/osi_misc.c */
@@ -436,7 +444,8 @@ extern void osi_iput(struct inode *ip);
 extern void afs_osi_SetTime(osi_timeval_t *atv);
 
 /* LINUX/osi_misc.c */
-#if AFS_LINUX24_ENV
+#ifdef AFS_LINUX20_ENV
+#ifdef AFS_LINUX24_ENV
 extern int osi_lookupname(char *aname, uio_seg_t seg, int followlink,
                vnode_t **dirvpp, struct dentry **dpp);
 extern int osi_InitCacheInfo(char *aname);
@@ -454,8 +463,16 @@ extern void check_bad_parent(struct dentry *dp);
 extern void osi_linux_mask(void);
 extern void osi_linux_unmask(void);
 extern void osi_linux_rxkreg(void);
+extern int setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag, int change_parent);
+#endif
 
 
+/* OBSD/osi_misc.c */
+#ifdef AFS_OBSD_ENV
+extern int setpag(struct proc *proc, struct ucred **cred, afs_uint32 pagvalue,
+                 afs_uint32 *newpag, int change_parent);
+#endif
+
 /* ARCH/osi_sleep.c */
 extern void afs_osi_InitWaitHandle(struct afs_osi_WaitHandle *achandle);
 extern void afs_osi_CancelWait(struct afs_osi_WaitHandle *achandle);
@@ -470,6 +487,13 @@ extern void afs_osi_Sleep(void *event);
 extern int afs_osi_SleepSig(void *event);
 #endif
 
+
+/* ARCH/osi_inode.c */
+extern int afs_syscall_icreate();
+extern int afs_syscall_iopen();
+extern int afs_syscall_iincdec();
+
+
 /* ARCH/osi_file.c */
 extern int afs_osicred_initialized;
 #if defined(AFS_SUN57_64BIT_ENV) || defined(AFS_SGI62_ENV)
@@ -541,6 +565,7 @@ extern afs_int32 afs_waitForever;
 extern short afs_waitForeverCount;
 extern afs_int32 afs_showflags;
 extern int afs_defaultAsynchrony;
+extern int afs_syscall_pioctl();
 
 /* afs_segments.c */
 extern int afs_StoreMini(register struct vcache *avc, struct vrequest *areq);
@@ -643,6 +668,7 @@ extern void afs_SetPrimary(register struct unixuser *au, register int aflag);
 extern char *afs_cv2string(char *ttp, afs_uint32 aval);
 extern int afs_strcasecmp(char *s1, char *s2);
 extern char *afs_strdup(char *s);
+extern char *afs_strcat(char *s1, char *s2);
 extern char *afs_strchr(char *s, int c);
 extern void print_internet_address(char *preamble, struct srvAddr *sa,
                            char *postamble, int flag);
@@ -767,8 +793,6 @@ extern int HandleFlock(register struct vcache *avc, int acom,
 
 
 /* VNOPS/afs_vnop_lookup.c */
-extern char *afs_strcat(register char *s1, register char *s2);
-extern char *afs_index(register char *a, register char c);
 extern int EvalMountPoint(register struct vcache *avc, struct vcache *advc,
         struct volume **avolpp, register struct vrequest *areq);
 extern void afs_InitFakeStat(struct afs_fakestat_state *state);
@@ -780,12 +804,12 @@ extern void afs_PutFakeStat(struct afs_fakestat_state *state);
 extern int afs_ENameOK(register char *aname);
 extern int afs_getsysname(register struct vrequest *areq, register struct vcache *adp, 
         register char *bufp);
-extern int Check_AtSys(register struct vcache *avc, const char *aname, 
+extern void Check_AtSys(register struct vcache *avc, const char *aname, 
         struct sysname_info *state, struct vrequest *areq);
 extern int Next_AtSys(register struct vcache *avc, struct vrequest *areq, 
         struct sysname_info *state);
 extern int afs_DoBulkStat(struct vcache *adp, long dirCookie, struct vrequest *areqp);
-
+extern int afs_lookup();
 
 
 /* VNOPS/afs_vnop_read.c */
@@ -794,6 +818,8 @@ extern afs_int32 nihints;
 extern afs_int32 usedihint;
 extern int afs_MemRead(register struct vcache *avc, struct uio *auio, struct AFS_UCRED *acred, 
         daddr_t albn, struct buf **abpp, int noLock);
+extern int afs_UFSRead(register struct vcache *avc, struct uio *auio,
+       struct AFS_UCRED *acred, daddr_t albn, struct buf **abpp, int noLock);
 
 
 /* VNOPS/afs_vnop_readdir.c */
@@ -806,8 +832,13 @@ extern int afsremove(register struct vcache *adp, register struct dcache *tdc,
 extern int afs_remunlink(register struct vcache *avc, register int doit);
 
 
+/* VNOPS/afs_vnop_rename.c */
+extern int afsrename();
+
+
 /* VNOPS/afs_vnop_symlink.c */
 extern int afs_MemHandleLink(register struct vcache *avc, struct vrequest *areq);
+extern int afs_UFSHandleLink(register struct vcache *avc, struct vrequest *areq);
 
 /* VNOPS/afs_vnop_flock.c */
 extern afs_int32 lastWarnTime;
@@ -844,7 +875,6 @@ extern struct volume *afs_GetVolume(struct VenusFid *afid, struct vrequest *areq
         afs_int32 locktype);
 extern struct volume *afs_GetVolumeByName(register char *aname, afs_int32 acell, 
         int agood, struct vrequest *areq, afs_int32 locktype);
-
 extern struct volume *afs_UFSGetVolSlot(void);
 extern void afs_CheckVolumeNames(int flags);
 
@@ -867,8 +897,8 @@ extern afs_int32 RXSTATS_ExecuteRequest(struct rx_call *acall);
 
 
 
-#if defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_AIX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-#include "../afs/osi_prototypes.h"
+#if defined(AFS_SUN5_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_AIX_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
+#include "osi_prototypes.h"
 #endif
 
 #endif /* _AFS_PROTOTYPES_H_ */