Remove struct from AFS_UCRED instantiations (opaque credential type support)

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

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index a6ff4dd..fad0b47 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -210,7 +210,7 @@ extern void afs_Daemon(void);
 extern struct brequest *afs_BQueue(register short aopcode,
                                   register struct vcache *avc,
                                   afs_int32 dontwait, afs_int32 ause,
-                                  struct AFS_UCRED *acred,
+                                  AFS_UCRED *acred,
                                   afs_size_t asparm0, afs_size_t asparm1,
                                   void *apparm0);
 extern void afs_SetCheckServerNATmode(int isnat);
@@ -265,7 +265,7 @@ extern int afs_HashOutDCache(struct dcache *adc, int zap);
 extern int afs_MaybeFreeDiscardedDCache(void);
 extern int afs_RefDCache(struct dcache *adc);
 extern void afs_TryToSmush(register struct vcache *avc,
-                          struct AFS_UCRED *acred, int sync);
+                          AFS_UCRED *acred, int sync);
 extern void updateV2DC(int lockVc, struct vcache *v, struct dcache *d,
                       int src);
 extern void afs_WriteThroughDSlots(void);
@@ -305,9 +305,9 @@ extern int afs_DynrootNewVnode(struct vcache *avc,
 extern int afs_InitDynroot(void);
 extern int afs_SetDynrootEnable(int enable);
 extern int afs_GetDynrootEnable(void);
-extern int afs_DynrootVOPRemove(struct vcache *avc, struct AFS_UCRED *acred,
+extern int afs_DynrootVOPRemove(struct vcache *avc, AFS_UCRED *acred,
                                char *aname);
-extern int afs_DynrootVOPSymlink(struct vcache *avc, struct AFS_UCRED *acred,
+extern int afs_DynrootVOPSymlink(struct vcache *avc, AFS_UCRED *acred,
                                 char *aname, char *atargetName);
 
 /* afs_error.c */
@@ -522,7 +522,7 @@ extern struct afs_exporter *afs_nfsexported;
 extern struct afs_exporter *afs_nfsexporter;
 extern void afs_nfsclient_init(void);
 extern int afs_nfsclient_reqhandler(struct afs_exporter *exporter,
-                                   struct AFS_UCRED **cred,
+                                   AFS_UCRED **cred,
                                    afs_int32 host, afs_int32 *pagparam,
                                    struct afs_exporter **outexporter);
 extern void shutdown_nfsclnt(void);
@@ -545,7 +545,7 @@ extern void shutdown_osinet(void);
 extern int afs_osi_suser(void *credp);
 extern void afs_osi_TraverseProcTable(void);
 #if defined(KERNEL) && !defined(UKERNEL) && defined(AFS_PROC)
-extern const struct AFS_UCRED *afs_osi_proc2cred(AFS_PROC * pr);
+extern const AFS_UCRED *afs_osi_proc2cred(AFS_PROC * pr);
 #endif
 
 /* afs_osi_alloc.c */
@@ -571,7 +571,7 @@ extern void shutdown_osinet(void);
 
 /* afs_osi_pag.c */
 #if defined(AFS_SUN5_ENV)
-extern int afs_setpag(struct AFS_UCRED **credpp);
+extern int afs_setpag(AFS_UCRED **credpp);
 #elif  defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 extern int afs_setpag(struct proc *p, void *args, int *retval);
 #else
@@ -581,11 +581,11 @@ extern int afs_setpag(void);
 extern afs_uint32 genpag(void);
 extern afs_uint32 getpag(void);
 #if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
-extern int AddPag(struct proc *p, afs_int32 aval, struct AFS_UCRED **credpp);
+extern int AddPag(struct proc *p, afs_int32 aval, AFS_UCRED **credpp);
 #else
-extern int AddPag(afs_int32 aval, struct AFS_UCRED **credpp);
+extern int AddPag(afs_int32 aval, AFS_UCRED **credpp);
 #endif
-extern int afs_InitReq(register struct vrequest *av, struct AFS_UCRED *acred);
+extern int afs_InitReq(register struct vrequest *av, AFS_UCRED *acred);
 #if defined(UKERNEL)
 extern afs_uint32 afs_get_pag_from_groups(gid_t g0a, gid_t g1a);
 #else
@@ -594,7 +594,7 @@ extern afs_uint32 afs_get_pag_from_groups(struct group_info *gi);
 #endif
 #endif
 extern void afs_get_groups_from_pag(afs_uint32 pag, gid_t * g0p, gid_t * g1p);
-extern afs_int32 PagInCred(struct AFS_UCRED *cred);
+extern afs_int32 PagInCred(AFS_UCRED *cred);
 
 /* afs_osi_uio.c */
 extern int afsio_copy(struct uio *ainuio, struct uio *aoutuio,
@@ -605,11 +605,11 @@ extern int afsio_skip(struct uio *auio, afs_int32 asize);
 /* afs_osi_vm.c */
 extern int osi_Active(register struct vcache *avc);
 extern void osi_FlushPages(register struct vcache *avc,
-                          struct AFS_UCRED *credp);
+                          AFS_UCRED *credp);
 extern void osi_FlushText_really(register struct vcache *vp);
 extern int osi_VMDirty_p(struct vcache *avc);
 #ifndef UKERNEL
-extern void osi_ReleaseVM(struct vcache *avc, struct AFS_UCRED *acred);
+extern void osi_ReleaseVM(struct vcache *avc, AFS_UCRED *acred);
 #endif
 
 
@@ -656,10 +656,10 @@ extern int afs_osi_SleepSig(void *event);
 /* ARCH/osi_inode.c */
 #ifdef AFS_SUN5_ENV
 extern int afs_syscall_icreate(dev_t, long, long, long, long, long, 
-                              rval_t *, struct AFS_UCRED *);
-extern int afs_syscall_iopen(dev_t, int, int, rval_t *, struct AFS_UCRED *);
+                              rval_t *, AFS_UCRED *);
+extern int afs_syscall_iopen(dev_t, int, int, rval_t *, AFS_UCRED *);
 extern int afs_syscall_iincdec(dev_t, int, int, int, rval_t *, 
-                              struct AFS_UCRED *);
+                              AFS_UCRED *);
 #elif defined(AFS_SGI65_ENV)
 extern int afs_syscall_icreate(afs_uint32, afs_uint32, afs_uint32, afs_uint32, afs_uint32, afs_uint32, rval_t *);
 extern int afs_syscall_iopen(int, ino_t, int, rval_t *);
@@ -711,11 +711,11 @@ extern int setpag(struct proc *proc, struct ucred **cred, afs_uint32 pagvalue,
 /* ARCH/osi_vm.c */
 extern int osi_VM_FlushVCache(struct vcache *avc, int *slept);
 extern void osi_VM_StoreAllSegments(struct vcache *avc);
-extern void osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred,
+extern void osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred,
                              int sync);
-extern void osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp);
+extern void osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp);
 extern void osi_VM_Truncate(struct vcache *avc, int alen,
-                           struct AFS_UCRED *acred);
+                           AFS_UCRED *acred);
 extern void osi_VM_TryReclaim(struct vcache *avc, int *slept);
 extern void osi_VM_NukePages(struct vnode *vp, off_t offset, off_t size);
 extern int osi_VM_Setup(struct vcache *avc, int force);
@@ -723,7 +723,7 @@ extern int osi_VM_Setup(struct vcache *avc, int force);
 #ifdef AFS_SUN5_ENV
 extern int osi_VM_GetDownD(struct vcache *avc, struct dcache *adc);
 extern void osi_VM_PreTruncate(struct vcache *avc, int alen,
-                              struct AFS_UCRED *acred);
+                              AFS_UCRED *acred);
 #endif
 
 
@@ -740,7 +740,7 @@ extern int numvnodes;               /* number vnodes in use now */
 extern struct vfs_ubcops afs_ubcops;
 #endif
 #endif
-extern int afs_inactive(struct vcache *avc, struct AFS_UCRED *acred);
+extern int afs_inactive(struct vcache *avc, AFS_UCRED *acred);
 
 /* afs_osifile.c */
 
@@ -775,11 +775,11 @@ extern void afspag_Shutdown(void);
 extern afs_rwlock_t afs_xpagcell;
 extern afs_rwlock_t afs_xpagsys;
 extern int afspag_PUnlog(char *ain, afs_int32 ainSize,
-                        struct AFS_UCRED **acred);
+                        AFS_UCRED **acred);
 extern int afspag_PSetTokens(char *ain, afs_int32 ainSize,
-                            struct AFS_UCRED **acred);
+                            AFS_UCRED **acred);
 extern int afspag_PSetSysName(char *ain, afs_int32 ainSize,
-                              struct AFS_UCRED **acred);
+                              AFS_UCRED **acred);
 
 /* afs_pioctl.c */
 extern struct VenusFid afs_rootFid;
@@ -790,14 +790,14 @@ extern int afs_defaultAsynchrony;
 #if defined(AFS_DARWIN100_ENV)
 extern int afs_syscall64_pioctl(user_addr_t path, unsigned int com,
                                user_addr_t cmarg, int follow, \
-                               struct AFS_UCRED *credp);
+                               AFS_UCRED *credp);
 #endif
 #ifdef AFS_SUN5_ENV
 extern int afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, 
-                             int follow, rval_t *rvp, struct AFS_UCRED *credp);
+                             int follow, rval_t *rvp, AFS_UCRED *credp);
 #elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 extern int afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, 
-                             int follow, struct AFS_UCRED *credp);
+                             int follow, AFS_UCRED *credp);
 #else
 extern int afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg,
                              int follow);
@@ -815,7 +815,7 @@ extern int afs_ExtendSegments(struct vcache *avc,
                              afs_size_t alen, struct vrequest *areq);
 extern int afs_TruncateAllSegments(register struct vcache *avc,
                                   afs_size_t alen, struct vrequest *areq,
-                                  struct AFS_UCRED *acred);
+                                  AFS_UCRED *acred);
 
 /* afs_server.c */
 extern afs_rwlock_t afs_xsrvAddr;
@@ -1000,7 +1000,7 @@ extern afs_int32 afs_FetchStatus(struct vcache *avc, struct VenusFid *afid,
                                 struct AFSFetchStatus *Outsp);
 
 extern afs_int32 afs_FlushVCBs(afs_int32 lockit);
-extern void afs_InactiveVCache(struct vcache *avc, struct AFS_UCRED *acred);
+extern void afs_InactiveVCache(struct vcache *avc, AFS_UCRED *acred);
 extern struct vcache *afs_LookupVCache(struct VenusFid *afid,
                                       struct vrequest *areq,
                                       afs_int32 * cached, struct vcache *adp,
@@ -1034,7 +1034,7 @@ extern int afs_RemoteLookup(register struct VenusFid *afid,
                            struct AFSCallBack *CallBackp,
                            struct server **serverp,
                            struct AFSVolSync *tsyncp);
-extern void afs_ResetVCache(struct vcache *, struct AFS_UCRED *);
+extern void afs_ResetVCache(struct vcache *, AFS_UCRED *);
 extern afs_int32 afs_NFSFindVCache(struct vcache **avcp,
                                   struct VenusFid *afid);
 extern void afs_vcacheInit(int astatSize);
@@ -1050,33 +1050,33 @@ extern int afs_AccessOK(struct vcache *avc, afs_int32 arights,
                        struct vrequest *areq, afs_int32 check_mode_bits);
 #if defined(AFS_SUN5_ENV) || (defined(AFS_SGI_ENV) && !defined(AFS_SGI65_ENV))
 extern int afs_access(OSI_VC_DECL(avc), register afs_int32 amode, int flags,
-                     struct AFS_UCRED *acred);
+                     AFS_UCRED *acred);
 #else
 extern int afs_access(OSI_VC_DECL(avc), register afs_int32 amode,
-                     struct AFS_UCRED *acred);
+                     AFS_UCRED *acred);
 #endif
 extern int afs_getRights(OSI_VC_DECL(avc), register afs_int32 arights,
-                        struct AFS_UCRED *acred);
+                        AFS_UCRED *acred);
 
 /* VNOPS/afs_vnop_attrs.c */
 extern int afs_CopyOutAttrs(register struct vcache *avc,
                            register struct vattr *attrs);
 #if     defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
 extern int afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, int flags,
-                      struct AFS_UCRED *acred);
+                      AFS_UCRED *acred);
 #else
 extern int afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs,
-                      struct AFS_UCRED *acred);
+                      AFS_UCRED *acred);
 #endif
 extern int afs_VAttrToAS(register struct vcache *avc,
                         register struct vattr *av,
                         register struct AFSStoreStatus *as);
 #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
 extern int afs_setattr(OSI_VC_DECL(avc), register struct vattr *attrs,
-                      int flags, struct AFS_UCRED *acred);
+                      int flags, AFS_UCRED *acred);
 #else
 extern int afs_setattr(OSI_VC_DECL(avc), register struct vattr *attrs,
-                      struct AFS_UCRED *acred);
+                      AFS_UCRED *acred);
 #endif
 
 /* VNOPS/afs_vnop_create.c */
@@ -1086,11 +1086,11 @@ extern int afs_create(struct nameidata *ndp, struct vattr *attrs);
 #ifdef AFS_SGI64_ENV
 extern int afs_create(OSI_VC_DECL(adp), char *aname, struct vattr *attrs,
                      int flags, int amode, struct vcache **avcp,
-                     struct AFS_UCRED *acred);
+                     AFS_UCRED *acred);
 #else /* AFS_SGI64_ENV */
 extern int afs_create(OSI_VC_DECL(adp), char *aname, struct vattr *attrs,
                      enum vcexcl aexcl, int amode, struct vcache **avcp,
-                     struct AFS_UCRED *acred);
+                     AFS_UCRED *acred);
 #endif /* AFS_SGI64_ENV */
 #endif /* AFS_OSF_ENV */
 extern int afs_LocalHero(register struct vcache *avc,
@@ -1100,12 +1100,12 @@ extern int afs_LocalHero(register struct vcache *avc,
 /* VNOPS/afs_vnop_dirops.c */
 
 extern int afs_mkdir(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, 
-                    register struct vcache **avcp, struct AFS_UCRED *acred);
+                    register struct vcache **avcp, AFS_UCRED *acred);
 #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
 extern int afs_rmdir(OSI_VC_DECL(adp), char *aname, struct vnode *cdirp, 
-                    struct AFS_UCRED *acred);
+                    AFS_UCRED *acred);
 #else
-extern int afs_rmdir(OSI_VC_DECL(adp), char *aname, struct AFS_UCRED *acred);
+extern int afs_rmdir(OSI_VC_DECL(adp), char *aname, AFS_UCRED *acred);
 #endif
 
 struct fid;
@@ -1130,22 +1130,22 @@ extern int HandleFlock(register struct vcache *avc, int acom,
 
 #ifdef AFS_OSF_ENV
 extern int afs_lockctl(struct vcache * avc, struct eflock * af, int flag,
-                      struct AFS_UCRED * acred, pid_t clid, off_t offset);
+                      AFS_UCRED * acred, pid_t clid, off_t offset);
 #elif defined(AFS_SGI_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 extern int afs_lockctl(struct vcache * avc, struct AFS_FLOCK * af, int acmd,
-                      struct AFS_UCRED * acred, pid_t clid);
+                      AFS_UCRED * acred, pid_t clid);
 #else
 extern int afs_lockctl(struct vcache * avc, struct AFS_FLOCK * af, int acmd,
-                      struct AFS_UCRED * acred);
+                      AFS_UCRED * acred);
 #endif
 
 /* VNOPS/afs_vnop_link.c */
 #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
 extern int afs_link(OSI_VC_DECL(adp), struct vcache *avc, char *aname, 
-                   struct AFS_UCRED *acred);
+                   AFS_UCRED *acred);
 #else
 extern int afs_link(struct vcache *avc, OSI_VC_DECL(adp), char *aname, 
-                   struct AFS_UCRED *acred);
+                   AFS_UCRED *acred);
 #endif
 
 /* VNOPS/afs_vnop_lookup.c */
@@ -1169,26 +1169,26 @@ extern int afs_DoBulkStat(struct vcache *adp, long dirCookie,
                          struct vrequest *areqp);
 #ifdef AFS_OSF_ENV
 extern int afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, 
-                     struct AFS_UCRED *acred, int opflag, int wantparent);
+                     AFS_UCRED *acred, int opflag, int wantparent);
 #elif defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV)
 extern int afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, 
                      struct pathname *pnp, int flags, struct vnode *rdir, 
-                     struct AFS_UCRED *acred);
+                     AFS_UCRED *acred);
 #elif defined(UKERNEL)
 extern int afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, 
-                     struct AFS_UCRED *acred, int flags);
+                     AFS_UCRED *acred, int flags);
 #else
 extern int afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, 
-                     struct AFS_UCRED *acred);
+                     AFS_UCRED *acred);
 #endif
        
 /* VNOPS/afs_vnop_open.c */
 #ifdef AFS_SGI64_ENV
 extern int afs_open(bhv_desc_t * bhv, struct vcache **avcp, afs_int32 aflags,
-                   struct AFS_UCRED *acred);
+                   AFS_UCRED *acred);
 #else
 extern int afs_open(struct vcache **avcp, afs_int32 aflags,
-                   struct AFS_UCRED *acred);
+                   AFS_UCRED *acred);
 #endif
 
 
@@ -1197,52 +1197,52 @@ extern afs_int32 maxIHint;
 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,
+                      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,
+                      AFS_UCRED *acred, daddr_t albn,
                       struct buf **abpp, int noLock);
 extern void afs_PrefetchChunk(struct vcache *avc, struct dcache *adc,
-                             struct AFS_UCRED *acred, struct vrequest *areq);
+                             AFS_UCRED *acred, struct vrequest *areq);
 
 
 /* VNOPS/afs_vnop_readdir.c */
 extern int afs_rd_stash_i;
 #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 extern int afs_readdir(OSI_VC_DECL(avc), struct uio *auio, 
-                      struct AFS_UCRED *acred, int *eofp);
+                      AFS_UCRED *acred, int *eofp);
 #elif defined(AFS_HPUX100_ENV)
 extern int afs_readdir2(OSI_VC_DECL(avc), struct uio *auio, 
-                       struct AFS_UCRED *acred);
+                       AFS_UCRED *acred);
 #else
 extern int afs_readdir(OSI_VC_DECL(avc), struct uio *auio, 
-                      struct AFS_UCRED *acred);
+                      AFS_UCRED *acred);
 #endif
 
 /* VNOPS/afs_vnop_remove.c */
 extern int afsremove(register struct vcache *adp, register struct dcache *tdc,
                     register struct vcache *tvc, char *aname,
-                    struct AFS_UCRED *acred, struct vrequest *treqp);
+                    AFS_UCRED *acred, struct vrequest *treqp);
 extern int afs_remunlink(register struct vcache *avc, register int doit);
-extern int afs_remove(OSI_VC_DECL(adp), char *aname, struct AFS_UCRED *acred);
+extern int afs_remove(OSI_VC_DECL(adp), char *aname, AFS_UCRED *acred);
 extern char *afs_newname(void);
 
 /* VNOPS/afs_vnop_rename.c */
 extern int afsrename(struct vcache *aodp, char *aname1, struct vcache *andp,
-                    char *aname2, struct AFS_UCRED *acred,
+                    char *aname2, AFS_UCRED *acred,
                     struct vrequest *areq);
 #ifdef AFS_SGI_ENV
 extern int afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp, 
                      char *aname2, struct pathname *npnp, 
-                     struct AFS_UCRED *acred);
+                     AFS_UCRED *acred);
 #else
 extern int afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp, 
-                     char *aname2, struct AFS_UCRED *acred);
+                     char *aname2, AFS_UCRED *acred);
 #endif
        
 /* VNOPS/afs_vnop_strategy.c */
 #if defined(AFS_SUN5_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
-extern int afs_ustrategy(register struct buf *adp, struct AFS_UCRED *credp);
+extern int afs_ustrategy(register struct buf *adp, AFS_UCRED *credp);
 #else
 extern int afs_ustrategy(register struct buf *adp);
 #endif
@@ -1254,50 +1254,50 @@ extern int afs_UFSHandleLink(register struct vcache *avc,
                             struct vrequest *areq);
 extern int afs_symlink(OSI_VC_DECL(adp), char *aname, 
                       struct vattr *attrs, char *atargetName, 
-                      struct AFS_UCRED *acred);
+                      AFS_UCRED *acred);
 extern int afs_readlink(OSI_VC_DECL(avc), struct uio *auio,
-                       struct AFS_UCRED *acred);
+                       AFS_UCRED *acred);
 
 /* VNOPS/afs_vnop_write.c */
 extern int afs_MemWrite(register struct vcache *avc, struct uio *auio,
-                       int aio, struct AFS_UCRED *acred, int noLock);
+                       int aio, AFS_UCRED *acred, int noLock);
 extern int afs_StoreOnLastReference(register struct vcache *avc,
                                    register struct vrequest *treq);
 extern int afs_UFSWrite(register struct vcache *avc, struct uio *auio,
-                       int aio, struct AFS_UCRED *acred, int noLock);
+                       int aio, AFS_UCRED *acred, int noLock);
 extern int afs_DoPartialWrite(register struct vcache *avc,
                              struct vrequest *areq);
 extern int afs_closex(register struct file *afd);
 
 #ifdef AFS_SGI65_ENV
 extern int afs_close(OSI_VC_DECL(avc), afs_int32 aflags, 
-                    lastclose_t lastclose, struct AFS_UCRED *acred);
+                    lastclose_t lastclose, AFS_UCRED *acred);
 #elif defined(AFS_SGI64_ENV)
 extern int afs_close(OSI_VC_DECL(avc), afs_int32 aflags, 
                     lastclose_t lastclose, off_t offset, 
-                    struct AFS_UCRED *acred, struct flid *flp);
+                    AFS_UCRED *acred, struct flid *flp);
 #elif defined(AFS_SGI_ENV)
 extern int afs_close(OSI_VC_DECL(avc), afs_int32 aflags, 
                     lastclose_t lastclose, off_t offset,
-                    struct AFS_UCRED *acred);
+                    AFS_UCRED *acred);
 #elif defined(AFS_SUN5_ENV)
 extern int afs_close(OSI_VC_DECL(avc), afs_int32 aflags, int count, 
-                    offset_t offset, struct AFS_UCRED *acred);
+                    offset_t offset, AFS_UCRED *acred);
 #else
 extern int afs_close(OSI_VC_DECL(avc), afs_int32 aflags,  
-                    struct AFS_UCRED *acred);
+                    AFS_UCRED *acred);
 #endif
 
 #ifdef AFS_OSF_ENV
-extern int afs_fsync(OSI_VC_DECL(avc), int fflags, struct AFS_UCRED *acred, 
+extern int afs_fsync(OSI_VC_DECL(avc), int fflags, AFS_UCRED *acred, 
                     int waitfor);
 #elif defined(AFS_SGI65_ENV)
-extern int afs_fsync(OSI_VC_DECL(avc), int flags, struct AFS_UCRED *acred, 
+extern int afs_fsync(OSI_VC_DECL(avc), int flags, AFS_UCRED *acred, 
                     off_t start, off_t stop);
 #elif defined(AFS_SGI_ENV) || defined(AFS_SUN53_ENV)
-extern int afs_fsync(OSI_VC_DECL(avc), int flag, struct AFS_UCRED *acred);
+extern int afs_fsync(OSI_VC_DECL(avc), int flag, AFS_UCRED *acred);
 #else
-extern int afs_fsync(OSI_VC_DECL(avc), struct AFS_UCRED *acred);
+extern int afs_fsync(OSI_VC_DECL(avc), AFS_UCRED *acred);
 #endif