From 8a8244dd351f865af2da3b5ebb746ba57723b6a9 Mon Sep 17 00:00:00 2001 From: "matt@linuxbox.com" Date: Thu, 3 Sep 2009 10:15:18 -0400 Subject: [PATCH] Remove struct from AFS_UCRED instantiations (opaque credential type support) The identifier AFS_UCRED is intended as a preprocessor alias to a possibly-opaque credential type. A platform header will normally rename AFS_UCRED to a platform credential type with #define. This is not intended to change the meaning of AFS_UCRED, but removes the assumption that it is a struct type, which may not be true, depending on the platform and other decisions made by the AFS client port. Reviewed-on: http://gerrit.openafs.org/397 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/AIX/osi_file.c | 10 +- src/afs/AIX/osi_machdep.h | 2 +- src/afs/AIX/osi_vm.c | 6 +- src/afs/AIX/osi_vnodeops.c | 2 +- src/afs/DARWIN/osi_file.c | 10 +- src/afs/DARWIN/osi_machdep.h | 2 +- src/afs/DARWIN/osi_vm.c | 6 +- src/afs/FBSD/osi_file.c | 2 +- src/afs/FBSD/osi_machdep.h | 2 +- src/afs/FBSD/osi_vm.c | 6 +- src/afs/HPUX/osi_file.c | 10 +- src/afs/HPUX/osi_machdep.h | 3 +- src/afs/HPUX/osi_vm.c | 6 +- src/afs/HPUX/osi_vnodeops.c | 44 ++++---- src/afs/IRIX/osi_file.c | 8 +- src/afs/IRIX/osi_machdep.h | 2 +- src/afs/IRIX/osi_vm.c | 6 +- src/afs/LINUX/osi_file.c | 4 +- src/afs/LINUX/osi_machdep.h | 2 +- src/afs/LINUX/osi_misc.c | 2 +- src/afs/LINUX/osi_nfssrv.c | 4 +- src/afs/LINUX/osi_pag_module.c | 4 +- src/afs/LINUX/osi_prototypes.h | 8 +- src/afs/LINUX/osi_vm.c | 6 +- src/afs/NBSD/osi_file.c | 8 +- src/afs/NBSD/osi_machdep.h | 2 +- src/afs/NBSD/osi_vm.c | 6 +- src/afs/NBSD/osi_vnodeops.c | 18 +-- src/afs/OBSD/osi_file.c | 2 +- src/afs/OBSD/osi_machdep.h | 2 +- src/afs/OBSD/osi_vm.c | 6 +- src/afs/OBSD/osi_vnodeops.c | 2 +- src/afs/SOLARIS/osi_file.c | 10 +- src/afs/SOLARIS/osi_inode.c | 12 +- src/afs/SOLARIS/osi_machdep.h | 4 +- src/afs/SOLARIS/osi_prototypes.h | 2 +- src/afs/SOLARIS/osi_vfsops.c | 8 +- src/afs/SOLARIS/osi_vm.c | 8 +- src/afs/SOLARIS/osi_vnodeops.c | 118 ++++++++++---------- src/afs/UKERNEL/afs_usrops.c | 2 +- src/afs/UKERNEL/osi_groups.c | 6 +- src/afs/UKERNEL/osi_machdep.h | 2 +- src/afs/UKERNEL/osi_vm.c | 6 +- src/afs/UKERNEL/osi_vnodeops.c | 2 +- src/afs/UKERNEL/sysincludes.h | 38 +++---- src/afs/VNOPS/afs_vnop_access.c | 6 +- src/afs/VNOPS/afs_vnop_attrs.c | 8 +- src/afs/VNOPS/afs_vnop_create.c | 4 +- src/afs/VNOPS/afs_vnop_dirops.c | 6 +- src/afs/VNOPS/afs_vnop_flock.c | 6 +- src/afs/VNOPS/afs_vnop_link.c | 4 +- src/afs/VNOPS/afs_vnop_lookup.c | 8 +- src/afs/VNOPS/afs_vnop_open.c | 4 +- src/afs/VNOPS/afs_vnop_read.c | 8 +- src/afs/VNOPS/afs_vnop_readdir.c | 10 +- src/afs/VNOPS/afs_vnop_remove.c | 6 +- src/afs/VNOPS/afs_vnop_rename.c | 6 +- src/afs/VNOPS/afs_vnop_strategy.c | 4 +- src/afs/VNOPS/afs_vnop_symlink.c | 4 +- src/afs/VNOPS/afs_vnop_write.c | 22 ++-- src/afs/afs.h | 4 +- src/afs/afs_bypasscache.c | 8 +- src/afs/afs_bypasscache.h | 8 +- src/afs/afs_chunkops.h | 4 +- src/afs/afs_daemons.c | 4 +- src/afs/afs_dcache.c | 2 +- src/afs/afs_disconnected.c | 10 +- src/afs/afs_dynroot.c | 4 +- src/afs/afs_nfsclnt.c | 4 +- src/afs/afs_nfsdisp.c | 180 +++++++++++++++--------------- src/afs/afs_osi.c | 4 +- src/afs/afs_osi.h | 2 +- src/afs/afs_osi_gcpags.c | 36 +++--- src/afs/afs_osi_pag.c | 38 +++---- src/afs/afs_osi_vm.c | 4 +- src/afs/afs_pag_call.c | 4 +- src/afs/afs_pag_cred.c | 6 +- src/afs/afs_pioctl.c | 32 +++--- src/afs/afs_prototypes.h | 156 +++++++++++++------------- src/afs/afs_segments.c | 4 +- src/afs/afs_user.c | 2 +- src/afs/afs_vcache.c | 8 +- src/afs/afsincludes.h | 6 + src/afs/discon.h | 4 +- src/afs/exporter.h | 2 +- 85 files changed, 535 insertions(+), 528 deletions(-) diff --git a/src/afs/AIX/osi_file.c b/src/afs/AIX/osi_file.c index 57372b138..2580491f1 100644 --- a/src/afs/AIX/osi_file.c +++ b/src/afs/AIX/osi_file.c @@ -17,7 +17,7 @@ int afs_osicred_initialized = 0; -struct AFS_UCRED afs_osi_cred; +AFS_UCRED afs_osi_cred; afs_lock_t afs_xosi; /* lock is for tvattr */ extern struct osi_dev cacheDev; extern struct vfs *afs_cacheVfsp; @@ -38,7 +38,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) } if (!afs_osicred_initialized) { /* valid for alpha_osf, SunOS, Ultrix */ - memset((char *)&afs_osi_cred, 0, sizeof(struct AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(AFS_UCRED)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; } @@ -108,7 +108,7 @@ osi_UFSClose(register struct osi_file *afile) int osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; struct vattr tvattr; register afs_int32 code; struct osi_stat tstat; @@ -151,7 +151,7 @@ int afs_osi_Read(register struct osi_file *afile, int offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; unsigned int resid; register afs_int32 code; register afs_int32 cnt1 = 0; @@ -209,7 +209,7 @@ int afs_osi_Write(register struct osi_file *afile, afs_int32 offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; unsigned int resid; register afs_int32 code; AFS_STATCNT(osi_Write); diff --git a/src/afs/AIX/osi_machdep.h b/src/afs/AIX/osi_machdep.h index a1658db14..f1d63ade1 100644 --- a/src/afs/AIX/osi_machdep.h +++ b/src/afs/AIX/osi_machdep.h @@ -26,7 +26,7 @@ extern long time; #define osi_Time() (time) -#define AFS_UCRED ucred +#define AFS_UCRED struct ucred #define AFS_PROC struct proc #define afs_bufferpages v.v_bufhw diff --git a/src/afs/AIX/osi_vm.c b/src/afs/AIX/osi_vm.c index 7f4db9938..05c83205c 100644 --- a/src/afs/AIX/osi_vm.c +++ b/src/afs/AIX/osi_vm.c @@ -120,7 +120,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * be some pages around when we return, newly created by concurrent activity. */ void -osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) { if (avc->segid) { ReleaseWriteLock(&avc->lock); @@ -137,7 +137,7 @@ osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) { if (avc->segid) { vm_flushp(avc->segid, 0, MAXFSIZE / PAGESIZE - 1); @@ -155,7 +155,7 @@ osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) { if (avc->segid) { int firstpage = (alen + PAGESIZE - 1) / PAGESIZE; diff --git a/src/afs/AIX/osi_vnodeops.c b/src/afs/AIX/osi_vnodeops.c index 0512a0f6a..5118e1190 100644 --- a/src/afs/AIX/osi_vnodeops.c +++ b/src/afs/AIX/osi_vnodeops.c @@ -1622,7 +1622,7 @@ afs_gn_strategy(struct buf *abp) int afs_inactive(struct vcache *avc, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { afs_InactiveVCache(avc, acred); } diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c index f056ed7f0..e78abb00d 100644 --- a/src/afs/DARWIN/osi_file.c +++ b/src/afs/DARWIN/osi_file.c @@ -18,7 +18,7 @@ int afs_osicred_initialized = 0; -struct AFS_UCRED afs_osi_cred; +AFS_UCRED afs_osi_cred; afs_lock_t afs_xosi; /* lock is for tvattr */ extern struct osi_dev cacheDev; extern struct mount *afs_cacheVfsp; @@ -148,7 +148,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) } if (!afs_osicred_initialized) { /* valid for alpha_osf, SunOS, Ultrix */ - memset((char *)&afs_osi_cred, 0, sizeof(struct AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(AFS_UCRED)); afs_osi_cred.cr_ref++; afs_osi_cred.cr_ngroups = 1; afs_osicred_initialized = 1; @@ -257,7 +257,7 @@ osi_UFSClose(register struct osi_file *afile) int osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; struct vattr tvattr; register afs_int32 code; struct osi_stat tstat; @@ -319,7 +319,7 @@ int afs_osi_Read(register struct osi_file *afile, int offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; afs_size_t resid; register afs_int32 code; #ifdef AFS_DARWIN80_ENV @@ -370,7 +370,7 @@ int afs_osi_Write(register struct osi_file *afile, afs_int32 offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; afs_size_t resid; register afs_int32 code; #ifdef AFS_DARWIN80_ENV diff --git a/src/afs/DARWIN/osi_machdep.h b/src/afs/DARWIN/osi_machdep.h index d13760c69..5e07aa3d6 100644 --- a/src/afs/DARWIN/osi_machdep.h +++ b/src/afs/DARWIN/osi_machdep.h @@ -138,7 +138,7 @@ static inline time_t osi_Time(void) { extern int hz; #endif -#define AFS_UCRED ucred +#define AFS_UCRED struct ucred #define AFS_PROC struct proc diff --git a/src/afs/DARWIN/osi_vm.c b/src/afs/DARWIN/osi_vm.c index a266c08e9..f0e7c04b4 100644 --- a/src/afs/DARWIN/osi_vm.c +++ b/src/afs/DARWIN/osi_vm.c @@ -87,7 +87,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * be some pages around when we return, newly created by concurrent activity. */ void -osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) { struct vnode *vp = AFSTOV(avc); void *object; @@ -118,7 +118,7 @@ osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) this, and also making sure that ubc's idea of the filesize is right more often */ void -osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) { struct vnode *vp = AFSTOV(avc); void *object; @@ -151,7 +151,7 @@ osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) { struct vnode *vp = AFSTOV(avc); #ifdef AFS_DARWIN80_ENV diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c index 04e12254d..0afddc19e 100644 --- a/src/afs/FBSD/osi_file.c +++ b/src/afs/FBSD/osi_file.c @@ -17,7 +17,7 @@ int afs_osicred_initialized = 0; -struct AFS_UCRED afs_osi_cred; +AFS_UCRED afs_osi_cred; afs_lock_t afs_xosi; /* lock is for tvattr */ extern struct osi_dev cacheDev; extern struct mount *afs_cacheVfsp; diff --git a/src/afs/FBSD/osi_machdep.h b/src/afs/FBSD/osi_machdep.h index 95ec9d2e8..8f882e9b1 100644 --- a/src/afs/FBSD/osi_machdep.h +++ b/src/afs/FBSD/osi_machdep.h @@ -31,7 +31,7 @@ #define osi_Time() time_second #define afs_hz hz -#define AFS_UCRED ucred +#define AFS_UCRED struct ucred #define AFS_PROC struct proc #define afs_bufferpages bufpages diff --git a/src/afs/FBSD/osi_vm.c b/src/afs/FBSD/osi_vm.c index 0ac850068..7e30f5054 100644 --- a/src/afs/FBSD/osi_vm.c +++ b/src/afs/FBSD/osi_vm.c @@ -199,7 +199,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * be some pages around when we return, newly created by concurrent activity. */ void -osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) { struct vnode *vp; struct vm_object *obj; @@ -248,7 +248,7 @@ osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) { struct vnode *vp; struct vm_object *obj; @@ -270,7 +270,7 @@ osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) { vnode_pager_setsize(AFSTOV(avc), alen); } diff --git a/src/afs/HPUX/osi_file.c b/src/afs/HPUX/osi_file.c index 6f47c3d56..2f7889819 100644 --- a/src/afs/HPUX/osi_file.c +++ b/src/afs/HPUX/osi_file.c @@ -18,7 +18,7 @@ int afs_osicred_initialized = 0; -struct AFS_UCRED afs_osi_cred; +AFS_UCRED afs_osi_cred; afs_lock_t afs_xosi; /* lock is for tvattr */ extern struct osi_dev cacheDev; extern struct vfs *afs_cacheVfsp; @@ -38,7 +38,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) } if (!afs_osicred_initialized) { /* valid for alpha_osf, SunOS, Ultrix */ - memset((char *)&afs_osi_cred, 0, sizeof(struct AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(AFS_UCRED)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; } @@ -95,7 +95,7 @@ osi_UFSClose(register struct osi_file *afile) int osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; struct vattr tvattr; register afs_int32 code; struct osi_stat tstat; @@ -137,7 +137,7 @@ int afs_osi_Read(register struct osi_file *afile, int offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; long resid; register afs_int32 code; register afs_int32 cnt1 = 0; @@ -188,7 +188,7 @@ int afs_osi_Write(register struct osi_file *afile, afs_int32 offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; long resid; register afs_int32 code; AFS_STATCNT(osi_Write); diff --git a/src/afs/HPUX/osi_machdep.h b/src/afs/HPUX/osi_machdep.h index e8d154459..89a5563a5 100644 --- a/src/afs/HPUX/osi_machdep.h +++ b/src/afs/HPUX/osi_machdep.h @@ -1,3 +1,4 @@ + /* * Copyright 2000, International Business Machines Corporation and others. * All Rights Reserved. @@ -24,7 +25,7 @@ extern struct timeval time; #define osi_Time() (time.tv_sec) -#define AFS_UCRED ucred +#define AFS_UCRED struct ucred #define AFS_PROC proc_t #define osi_vnhold(avc, r) do { VN_HOLD(AFSTOV(avc)); } while(0) diff --git a/src/afs/HPUX/osi_vm.c b/src/afs/HPUX/osi_vm.c index bf31f1a20..c21db3d56 100644 --- a/src/afs/HPUX/osi_vm.c +++ b/src/afs/HPUX/osi_vm.c @@ -59,7 +59,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * re-obtained. */ void -osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) { struct vnode *vp = AFSTOV(avc); @@ -81,7 +81,7 @@ osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) { ; /* Nothing here yet */ } @@ -93,7 +93,7 @@ osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) { ; /* Nothing here yet */ } diff --git a/src/afs/HPUX/osi_vnodeops.c b/src/afs/HPUX/osi_vnodeops.c index ad3e63b19..2c118a3fe 100644 --- a/src/afs/HPUX/osi_vnodeops.c +++ b/src/afs/HPUX/osi_vnodeops.c @@ -116,7 +116,7 @@ m_cpytoc(m, off, len, cp) afs_lockf(vp, flag, len, cred, fp, LB, UB) struct vnode *vp; int flag; - struct AFS_UCRED *cred; + AFS_UCRED *cred; struct file *fp; k_off_t len, LB, UB; { @@ -289,7 +289,7 @@ afs_bmap(avc, abn, anvp, anbn) afs_inactive(avc, acred) register struct vcache *avc; - struct AFS_UCRED *acred; + AFS_UCRED *acred; { struct vnode *vp = AFSTOV(avc); ulong_t context; @@ -320,7 +320,7 @@ afs_inactive(avc, acred) int -mp_afs_open(register struct vnode **avcp, int aflags, struct AFS_UCRED *acred) +mp_afs_open(register struct vnode **avcp, int aflags, AFS_UCRED *acred) { register int code; @@ -331,7 +331,7 @@ mp_afs_open(register struct vnode **avcp, int aflags, struct AFS_UCRED *acred) } int -mp_afs_close(register struct vnode *avcp, int aflags, struct AFS_UCRED *acred) +mp_afs_close(register struct vnode *avcp, int aflags, AFS_UCRED *acred) { register int code; @@ -343,7 +343,7 @@ mp_afs_close(register struct vnode *avcp, int aflags, struct AFS_UCRED *acred) int mp_afs_rdwr(register struct vnode *avcp, struct uio *uio, enum uio_rw arw, - int aio, struct AFS_UCRED *acred) + int aio, AFS_UCRED *acred) { register int code; long save_resid; @@ -361,7 +361,7 @@ mp_afs_rdwr(register struct vnode *avcp, struct uio *uio, enum uio_rw arw, int mp_afs_getattr(register struct vnode *avcp, struct vattr *attrs, - struct AFS_UCRED *acred, enum vsync unused1) + AFS_UCRED *acred, enum vsync unused1) { register int code; @@ -373,7 +373,7 @@ mp_afs_getattr(register struct vnode *avcp, struct vattr *attrs, int mp_afs_setattr(register struct vnode *avcp, register struct vattr *attrs, - struct AFS_UCRED *acred, int unused1) + AFS_UCRED *acred, int unused1) { register int code; @@ -384,7 +384,7 @@ mp_afs_setattr(register struct vnode *avcp, register struct vattr *attrs, } int -mp_afs_access(register struct vnode *avcp, int mode, struct AFS_UCRED *acred) +mp_afs_access(register struct vnode *avcp, int mode, AFS_UCRED *acred) { register int code; @@ -396,7 +396,7 @@ mp_afs_access(register struct vnode *avcp, int mode, struct AFS_UCRED *acred) int mp_afs_lookup(register struct vnode *adp, char *aname, - register struct vnode **avcp, struct AFS_UCRED *acred, + register struct vnode **avcp, AFS_UCRED *acred, struct vnode *unused1) { register int code; @@ -410,7 +410,7 @@ mp_afs_lookup(register struct vnode *adp, char *aname, int mp_afs_create(register struct vnode *adp, char *aname, struct vattr *attrs, enum vcexcl aexcl, int amode, struct vnode **avcp, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; @@ -423,7 +423,7 @@ mp_afs_create(register struct vnode *adp, char *aname, struct vattr *attrs, int mp_afs_remove(register struct vnode *adp, char *aname, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; @@ -435,7 +435,7 @@ mp_afs_remove(register struct vnode *adp, char *aname, int mp_afs_link(register struct vnode *avc, register struct vnode *adp, - char *aname, struct AFS_UCRED *acred) + char *aname, AFS_UCRED *acred) { register int code; @@ -448,7 +448,7 @@ mp_afs_link(register struct vnode *avc, register struct vnode *adp, int mp_afs_rename(register struct vnode *aodp, char *aname1, register struct vnode *andp, char *aname2, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; @@ -460,7 +460,7 @@ mp_afs_rename(register struct vnode *aodp, char *aname1, int mp_afs_mkdir(register struct vnode *adp, char *aname, struct vattr *attrs, - register struct vnode **avcp, struct AFS_UCRED *acred) + register struct vnode **avcp, AFS_UCRED *acred) { register int code; @@ -472,7 +472,7 @@ mp_afs_mkdir(register struct vnode *adp, char *aname, struct vattr *attrs, int -mp_afs_rmdir(register struct vnode *adp, char *aname, struct AFS_UCRED *acred) +mp_afs_rmdir(register struct vnode *adp, char *aname, AFS_UCRED *acred) { register int code; @@ -485,7 +485,7 @@ mp_afs_rmdir(register struct vnode *adp, char *aname, struct AFS_UCRED *acred) int mp_afs_readdir(register struct vnode *avc, struct uio *auio, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; @@ -497,7 +497,7 @@ mp_afs_readdir(register struct vnode *avc, struct uio *auio, int mp_afs_symlink(register struct vnode *adp, char *aname, struct vattr *attrs, - char *atargetName, struct AFS_UCRED *acred) + char *atargetName, AFS_UCRED *acred) { register int code; @@ -510,7 +510,7 @@ mp_afs_symlink(register struct vnode *adp, char *aname, struct vattr *attrs, int mp_afs_readlink(register struct vnode *avc, struct uio *auio, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; @@ -521,7 +521,7 @@ mp_afs_readlink(register struct vnode *avc, struct uio *auio, } int -mp_afs_fsync(register struct vnode *avc, struct AFS_UCRED *acred, int unused1) +mp_afs_fsync(register struct vnode *avc, AFS_UCRED *acred, int unused1) { register int code; @@ -556,7 +556,7 @@ mp_afs_brelse(register struct vnode *avc, struct buf *bp) int -mp_afs_inactive(register struct vnode *avc, struct AFS_UCRED *acred) +mp_afs_inactive(register struct vnode *avc, AFS_UCRED *acred) { register int code; @@ -568,7 +568,7 @@ mp_afs_inactive(register struct vnode *avc, struct AFS_UCRED *acred) int mp_afs_lockctl(struct vnode *avc, struct flock *af, int cmd, - struct AFS_UCRED *acred, struct file *unused1, off_t unused2, + AFS_UCRED *acred, struct file *unused1, off_t unused2, off_t unused3) { register int code; @@ -592,7 +592,7 @@ mp_afs_fid(struct vnode *avc, struct fid **fidpp) int mp_afs_readdir2(register struct vnode *avc, struct uio *auio, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; diff --git a/src/afs/IRIX/osi_file.c b/src/afs/IRIX/osi_file.c index 104ff106f..be5927c31 100644 --- a/src/afs/IRIX/osi_file.c +++ b/src/afs/IRIX/osi_file.c @@ -51,7 +51,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) } if (!afs_osicred_initialized) { /* valid for alpha_osf, SunOS, Ultrix */ - memset((char *)&afs_osi_cred, 0, sizeof(struct AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(AFS_UCRED)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; } @@ -101,7 +101,7 @@ osi_UFSClose(register struct osi_file *afile) int osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; struct vattr tvattr; register afs_int32 code; struct osi_stat tstat; @@ -131,7 +131,7 @@ int afs_osi_Read(register struct osi_file *afile, int offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; ssize_t resid; register afs_int32 code; register afs_int32 cnt1 = 0; @@ -171,7 +171,7 @@ int afs_osi_Write(register struct osi_file *afile, afs_int32 offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; ssize_t resid; register afs_int32 code; AFS_STATCNT(osi_Write); diff --git a/src/afs/IRIX/osi_machdep.h b/src/afs/IRIX/osi_machdep.h index 3cc7f79ce..10023b636 100644 --- a/src/afs/IRIX/osi_machdep.h +++ b/src/afs/IRIX/osi_machdep.h @@ -27,7 +27,7 @@ extern time_t time; #define osi_Time() (time) /* This gets redefined from ucred to cred in osi_vfs.h, just do it right */ -#define AFS_UCRED cred +#define AFS_UCRED struct cred #undef gop_lookupname #define gop_lookupname(fnamep,segflg,followlink,compvpp) lookupname((fnamep),(segflg),(followlink),NULL,(compvpp), NULL) diff --git a/src/afs/IRIX/osi_vm.c b/src/afs/IRIX/osi_vm.c index 124e9526f..77615748f 100644 --- a/src/afs/IRIX/osi_vm.c +++ b/src/afs/IRIX/osi_vm.c @@ -143,7 +143,7 @@ osi_VM_FlushVCache(struct vcache *avc, int *slept) * be some pages around when we return, newly created by concurrent activity. */ void -osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) { ReleaseWriteLock(&avc->lock); AFS_GUNLOCK(); @@ -216,7 +216,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) { vnode_t *vp = (vnode_t *) avc; @@ -241,7 +241,7 @@ osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) { PTOSSVP(&avc->v, (off_t) alen, (off_t) MAXLONG); } diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c index 3e819337f..2e99a8322 100644 --- a/src/afs/LINUX/osi_file.c +++ b/src/afs/LINUX/osi_file.c @@ -50,7 +50,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) } if (!afs_osicred_initialized) { /* valid for alpha_osf, SunOS, Ultrix */ - memset((char *)&afs_osi_cred, 0, sizeof(struct AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(AFS_UCRED)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; } @@ -109,7 +109,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) } if (!afs_osicred_initialized) { /* valid for alpha_osf, SunOS, Ultrix */ - memset((char *)&afs_osi_cred, 0, sizeof(struct AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(AFS_UCRED)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; } diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h index 0b2051ae5..b0017ffe7 100644 --- a/src/afs/LINUX/osi_machdep.h +++ b/src/afs/LINUX/osi_machdep.h @@ -172,7 +172,7 @@ typedef struct afs_cred { /* maps to task field: */ #endif struct afs_cred *cr_next; } cred_t; -#define AFS_UCRED afs_cred +#define AFS_UCRED struct afs_cred #define AFS_PROC struct task_struct #if !defined(current_cred) #define current_gid() (current->gid) diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c index 140cee479..eef087f1a 100644 --- a/src/afs/LINUX/osi_misc.c +++ b/src/afs/LINUX/osi_misc.c @@ -29,7 +29,7 @@ #endif int afs_osicred_initialized = 0; -struct AFS_UCRED afs_osi_cred; +AFS_UCRED afs_osi_cred; void afs_osi_SetTime(osi_timeval_t * tvp) diff --git a/src/afs/LINUX/osi_nfssrv.c b/src/afs/LINUX/osi_nfssrv.c index 6f1bf5767..a3df7b283 100644 --- a/src/afs/LINUX/osi_nfssrv.c +++ b/src/afs/LINUX/osi_nfssrv.c @@ -94,7 +94,7 @@ svcauth_afs_accept(struct svc_rqst *rqstp, u32 *authp) { struct nfs_server_thread *ns; struct afs_exporter *outexp; - struct AFS_UCRED *credp; + AFS_UCRED *credp; struct sockaddr_in *addr; int code; @@ -181,7 +181,7 @@ svcauth_afs_release(struct svc_rqst *rqstp) #endif -int osi_linux_nfs_initreq(struct vrequest *av, struct AFS_UCRED *cr, int *code) +int osi_linux_nfs_initreq(struct vrequest *av, AFS_UCRED *cr, int *code) { struct nfs_server_thread *ns; diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c index 63020ed89..d0f73faee 100644 --- a/src/afs/LINUX/osi_pag_module.c +++ b/src/afs/LINUX/osi_pag_module.c @@ -138,7 +138,7 @@ module_exit(afspag_cleanup); * However, we need to define them in order to resolve the reference, * unless we want to move afs_InitReq out of afs_osi_pag.c. */ -int osi_linux_nfs_initreq(struct vrequest *av, struct AFS_UCRED *cr, int *code) +int osi_linux_nfs_initreq(struct vrequest *av, AFS_UCRED *cr, int *code) { *code = EACCES; return 1; @@ -146,7 +146,7 @@ int osi_linux_nfs_initreq(struct vrequest *av, struct AFS_UCRED *cr, int *code) 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) { diff --git a/src/afs/LINUX/osi_prototypes.h b/src/afs/LINUX/osi_prototypes.h index a82143d66..29f7dba3b 100644 --- a/src/afs/LINUX/osi_prototypes.h +++ b/src/afs/LINUX/osi_prototypes.h @@ -28,7 +28,7 @@ extern cred_t *crref(void); extern void crset(cred_t * cr); /* osi_nfssrv.c */ -extern int osi_linux_nfs_initreq(struct vrequest *av, struct AFS_UCRED *cr, +extern int osi_linux_nfs_initreq(struct vrequest *av, AFS_UCRED *cr, int *code); extern void osi_linux_nfssrv_init(void); extern void osi_linux_nfssrv_shutdown(void); @@ -70,13 +70,13 @@ extern void osi_sysctl_clean(void); /* osi_vm.c */ extern int osi_VM_FlushVCache(struct vcache *avc, int *slept); -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_FSyncInval(struct vcache *avc); extern void osi_VM_StoreAllSegments(struct vcache *avc); -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); /* osi_vfsops.c */ extern void vattr2inode(struct inode *ip, struct vattr *vp); diff --git a/src/afs/LINUX/osi_vm.c b/src/afs/LINUX/osi_vm.c index 139b2c0d7..fea7ec3ef 100644 --- a/src/afs/LINUX/osi_vm.c +++ b/src/afs/LINUX/osi_vm.c @@ -69,7 +69,7 @@ osi_VM_FlushVCache(struct vcache *avc, int *slept) * be some pages around when we return, newly created by concurrent activity. */ void -osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) { struct inode *ip = AFSTOV(avc); @@ -123,7 +123,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) struct inode *ip = AFSTOV(avc); @@ -145,7 +145,7 @@ osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) vmtruncate(AFSTOV(avc), alen); diff --git a/src/afs/NBSD/osi_file.c b/src/afs/NBSD/osi_file.c index db94f5673..3777af1af 100644 --- a/src/afs/NBSD/osi_file.c +++ b/src/afs/NBSD/osi_file.c @@ -17,7 +17,7 @@ int afs_osicred_initialized = 0; -struct AFS_UCRED afs_osi_cred; +AFS_UCRED afs_osi_cred; afs_lock_t afs_xosi; /* lock is for tvattr */ extern struct osi_dev cacheDev; extern struct mount *afs_cacheVfsp; @@ -87,7 +87,7 @@ osi_UFSClose(register struct osi_file *afile) int osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; struct vattr tvattr; register afs_int32 code; struct osi_stat tstat; @@ -130,7 +130,7 @@ int afs_osi_Read(register struct osi_file *afile, int offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; unsigned int resid; register afs_int32 code; register afs_int32 cnt1 = 0; @@ -171,7 +171,7 @@ int afs_osi_Write(register struct osi_file *afile, afs_int32 offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; unsigned int resid; register afs_int32 code; AFS_STATCNT(osi_Write); diff --git a/src/afs/NBSD/osi_machdep.h b/src/afs/NBSD/osi_machdep.h index 2ba9c45e8..e8d302141 100644 --- a/src/afs/NBSD/osi_machdep.h +++ b/src/afs/NBSD/osi_machdep.h @@ -32,7 +32,7 @@ extern struct timeval time; #define osi_Time() (time.tv_sec) #define afs_hz hz -#define AFS_UCRED ucred +#define AFS_UCRED struct ucred #define AFS_PROC struct proc #define afs_bufferpages bufpages diff --git a/src/afs/NBSD/osi_vm.c b/src/afs/NBSD/osi_vm.c index e9fb2288e..02a87f59c 100644 --- a/src/afs/NBSD/osi_vm.c +++ b/src/afs/NBSD/osi_vm.c @@ -161,7 +161,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * be some pages around when we return, newly created by concurrent activity. */ void -osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) { #ifdef SECRETLY_OSF1 ReleaseWriteLock(&avc->lock); @@ -178,7 +178,7 @@ osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) { #ifdef SECRETLY_OSF1 ubc_flush_dirty(((struct vnode *)avc)->v_object, 0); @@ -193,7 +193,7 @@ osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) { #ifdef SECRETLY_OSF1 ubc_invalidate(((struct vnode *)avc)->v_object, alen, MAXINT - alen, diff --git a/src/afs/NBSD/osi_vnodeops.c b/src/afs/NBSD/osi_vnodeops.c index 47ba1519c..a6b4c1a8e 100644 --- a/src/afs/NBSD/osi_vnodeops.c +++ b/src/afs/NBSD/osi_vnodeops.c @@ -136,7 +136,7 @@ mp_afs_create(ndp, attrs) mp_afs_open(avcp, aflags, acred) struct vcache **avcp; afs_int32 aflags; - struct AFS_UCRED *acred; + AFS_UCRED *acred; { int code; AFS_GLOCK(); @@ -148,7 +148,7 @@ mp_afs_open(avcp, aflags, acred) mp_afs_access(avc, amode, acred) struct vcache *avc; afs_int32 amode; - struct AFS_UCRED *acred; + AFS_UCRED *acred; { int code; AFS_GLOCK(); @@ -172,7 +172,7 @@ mp_afs_close(avc, flags, cred) mp_afs_getattr(avc, attrs, acred) struct vcache *avc; struct vattr *attrs; - struct AFS_UCRED *acred; + AFS_UCRED *acred; { int code; AFS_GLOCK(); @@ -184,7 +184,7 @@ mp_afs_getattr(avc, attrs, acred) mp_afs_setattr(avc, attrs, acred) struct vcache *avc; struct vattr *attrs; - struct AFS_UCRED *acred; + AFS_UCRED *acred; { int code; AFS_GLOCK(); @@ -196,7 +196,7 @@ mp_afs_setattr(avc, attrs, acred) mp_afs_fsync(avc, fflags, acred, waitfor) struct vcache *avc; int fflags; - struct AFS_UCRED *acred; + AFS_UCRED *acred; int waitfor; { int code; @@ -273,7 +273,7 @@ mp_afs_symlink(ndp, attrs, atargetName) mp_afs_readdir(avc, auio, acred, eofp) struct vcache *avc; struct uio *auio; - struct AFS_UCRED *acred; + AFS_UCRED *acred; int *eofp; { int code; @@ -286,7 +286,7 @@ mp_afs_readdir(avc, auio, acred, eofp) mp_afs_readlink(avc, auio, acred) struct vcache *avc; struct uio *auio; - struct AFS_UCRED *acred; + AFS_UCRED *acred; { int code; AFS_GLOCK(); @@ -298,7 +298,7 @@ mp_afs_readlink(avc, auio, acred) mp_afs_lockctl(avc, af, flag, acred, clid, offset) struct vcache *avc; struct eflock *af; - struct AFS_UCRED *acred; + AFS_UCRED *acred; int flag; pid_t clid; off_t offset; @@ -339,7 +339,7 @@ mp_afs_abortop(ndp) mp_afs_inactive(avc, acred) register struct vcache *avc; - struct AFS_UCRED *acred; + AFS_UCRED *acred; { AFS_GLOCK(); afs_InactiveVCache(avc, acred); diff --git a/src/afs/OBSD/osi_file.c b/src/afs/OBSD/osi_file.c index cc05493df..10a2b8466 100644 --- a/src/afs/OBSD/osi_file.c +++ b/src/afs/OBSD/osi_file.c @@ -17,7 +17,7 @@ int afs_osicred_initialized; -struct AFS_UCRED afs_osi_cred; +AFS_UCRED afs_osi_cred; afs_lock_t afs_xosi; /* lock is for tvattr */ extern struct osi_dev cacheDev; extern struct mount *afs_cacheVfsp; diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h index b17d03bad..4b0960168 100644 --- a/src/afs/OBSD/osi_machdep.h +++ b/src/afs/OBSD/osi_machdep.h @@ -88,7 +88,7 @@ extern void osi_obsd_Free(void *p, size_t asize); /* proc, cred */ #define AFS_PROC struct proc -#define AFS_UCRED ucred +#define AFS_UCRED struct ucred #define afs_suser(x) afs_osi_suser(osi_curcred()) #define getpid() curproc #define osi_curcred() (curproc->p_cred->pc_ucred) diff --git a/src/afs/OBSD/osi_vm.c b/src/afs/OBSD/osi_vm.c index 1c2903229..f7524c0aa 100644 --- a/src/afs/OBSD/osi_vm.c +++ b/src/afs/OBSD/osi_vm.c @@ -82,7 +82,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * be some pages around when we return, newly created by concurrent activity. */ void -osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) { ReleaseWriteLock(&avc->lock); osi_VM_FlushVCache(avc, NULL); @@ -94,7 +94,7 @@ osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) { struct vnode *vp = AFSTOV(avc); @@ -112,7 +112,7 @@ osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) { uvm_vnp_setsize(AFSTOV(avc), alen); } diff --git a/src/afs/OBSD/osi_vnodeops.c b/src/afs/OBSD/osi_vnodeops.c index 93161ba44..9234e62c6 100644 --- a/src/afs/OBSD/osi_vnodeops.c +++ b/src/afs/OBSD/osi_vnodeops.c @@ -1082,7 +1082,7 @@ afs_nbsd_pathconf(void *v) 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); /* * Advisory record locking support (fcntl() POSIX style) diff --git a/src/afs/SOLARIS/osi_file.c b/src/afs/SOLARIS/osi_file.c index 751c018ae..2bfe2830d 100644 --- a/src/afs/SOLARIS/osi_file.c +++ b/src/afs/SOLARIS/osi_file.c @@ -18,7 +18,7 @@ int afs_osicred_initialized = 0; -struct AFS_UCRED afs_osi_cred; +AFS_UCRED afs_osi_cred; afs_lock_t afs_xosi; /* lock is for tvattr */ extern struct osi_dev cacheDev; extern struct vfs *afs_cacheVfsp; @@ -266,7 +266,7 @@ osi_UFSOpen(afs_dcache_id_t *ainode) } if (!afs_osicred_initialized) { /* valid for alpha_osf, SunOS, Ultrix */ - memset((char *)&afs_osi_cred, 0, sizeof(struct AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(AFS_UCRED)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; } @@ -317,7 +317,7 @@ osi_UFSClose(register struct osi_file *afile) int osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; struct vattr tvattr; register afs_int32 code; struct osi_stat tstat; @@ -372,7 +372,7 @@ int afs_osi_Read(register struct osi_file *afile, int offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; #if defined(AFS_SUN57_ENV) ssize_t resid; #else @@ -417,7 +417,7 @@ int afs_osi_Write(register struct osi_file *afile, afs_int32 offset, void *aptr, afs_int32 asize) { - struct AFS_UCRED *oldCred; + AFS_UCRED *oldCred; #if defined(AFS_SUN57_ENV) ssize_t resid; #else diff --git a/src/afs/SOLARIS/osi_inode.c b/src/afs/SOLARIS/osi_inode.c index 5fb43d1bb..5ada73b92 100644 --- a/src/afs/SOLARIS/osi_inode.c +++ b/src/afs/SOLARIS/osi_inode.c @@ -36,7 +36,7 @@ extern int (*ufs_iallocp) (), (*ufs_iupdatp) (), (*ufs_igetp) (), getinode(vfsp, dev, inode, ipp, credp, perror) struct vfs *vfsp; - struct AFS_UCRED *credp; + AFS_UCRED *credp; struct inode **ipp; dev_t dev; ino_t inode; @@ -82,7 +82,7 @@ getinode(vfsp, dev, inode, ipp, credp, perror) /* get an existing inode. Common code for iopen, iread/write, iinc/dec. */ igetinode(vfsp, dev, inode, ipp, credp, perror) - struct AFS_UCRED *credp; + AFS_UCRED *credp; struct inode **ipp; struct vfs *vfsp; dev_t dev; @@ -130,7 +130,7 @@ igetinode(vfsp, dev, inode, ipp, credp, perror) #ifdef AFS_SUN510_ENV dnlc_enter(ITOV(ip), "a", ITOV(ip)); #else - dnlc_enter(ITOV(ip), "a", ITOV(ip), (struct AFS_UCRED *)0); + dnlc_enter(ITOV(ip), "a", ITOV(ip), (AFS_UCRED *)0); #endif } @@ -144,7 +144,7 @@ int CrSync = 1; afs_syscall_icreate(dev, near_inode, param1, param2, param3, param4, rvp, credp) rval_t *rvp; - struct AFS_UCRED *credp; + AFS_UCRED *credp; long near_inode, param1, param2, param3, param4; dev_t dev; { @@ -238,7 +238,7 @@ afs_syscall_icreate(dev, near_inode, param1, param2, param3, param4, rvp, afs_syscall_iopen(dev, inode, usrmod, rvp, credp) rval_t *rvp; - struct AFS_UCRED *credp; + AFS_UCRED *credp; int inode, usrmod; dev_t dev; { @@ -308,7 +308,7 @@ int IncSync = 1; afs_syscall_iincdec(dev, inode, inode_p1, amount, rvp, credp) rval_t *rvp; - struct AFS_UCRED *credp; + AFS_UCRED *credp; int inode, inode_p1, amount; dev_t dev; { diff --git a/src/afs/SOLARIS/osi_machdep.h b/src/afs/SOLARIS/osi_machdep.h index e75073239..065d6cd8e 100644 --- a/src/afs/SOLARIS/osi_machdep.h +++ b/src/afs/SOLARIS/osi_machdep.h @@ -32,8 +32,8 @@ #define NFSSRV "/kernel/misc/nfssrv" #define NFSSRV_V9 "/kernel/misc/sparcv9/nfssrv" -#define AFS_UCRED cred -#define AFS_PROC struct proc +#define AFS_UCRED struct cred +#define AFS_PROC struct proc /* * Time related macros diff --git a/src/afs/SOLARIS/osi_prototypes.h b/src/afs/SOLARIS/osi_prototypes.h index a4e260958..54b617571 100644 --- a/src/afs/SOLARIS/osi_prototypes.h +++ b/src/afs/SOLARIS/osi_prototypes.h @@ -25,7 +25,7 @@ int afs_putapage(struct vnode *vp, struct page *pages, #else u_int * lenp, #endif - int flags, struct AFS_UCRED *credp); + int flags, AFS_UCRED *credp); diff --git a/src/afs/SOLARIS/osi_vfsops.c b/src/afs/SOLARIS/osi_vfsops.c index eb084af0d..870cc590a 100644 --- a/src/afs/SOLARIS/osi_vfsops.c +++ b/src/afs/SOLARIS/osi_vfsops.c @@ -37,7 +37,7 @@ int afsfstype = 0; int afs_mount(struct vfs *afsp, struct vnode *amvp, struct mounta *uap, - struct AFS_UCRED *credp) + AFS_UCRED *credp) { AFS_GLOCK(); @@ -71,10 +71,10 @@ afs_mount(struct vfs *afsp, struct vnode *amvp, struct mounta *uap, #if defined(AFS_SUN58_ENV) int -afs_unmount(struct vfs *afsp, int flag, struct AFS_UCRED *credp) +afs_unmount(struct vfs *afsp, int flag, AFS_UCRED *credp) #else int -afs_unmount(struct vfs *afsp, struct AFS_UCRED *credp) +afs_unmount(struct vfs *afsp, AFS_UCRED *credp) #endif { AFS_GLOCK(); @@ -199,7 +199,7 @@ afs_statvfs(struct vfs *afsp, struct statvfs *abp) } int -afs_sync(struct vfs *afsp, short flags, struct AFS_UCRED *credp) +afs_sync(struct vfs *afsp, short flags, AFS_UCRED *credp) { return 0; } diff --git a/src/afs/SOLARIS/osi_vm.c b/src/afs/SOLARIS/osi_vm.c index c4f55cd0b..59200804b 100644 --- a/src/afs/SOLARIS/osi_vm.c +++ b/src/afs/SOLARIS/osi_vm.c @@ -126,7 +126,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * re-obtained. */ void -osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) { AFS_GUNLOCK(); #if defined(AFS_SUN56_ENV) @@ -144,7 +144,7 @@ osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) { extern int afs_pvn_vptrunc; @@ -161,7 +161,7 @@ osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) * be called first, since it causes a pagein. */ void -osi_VM_PreTruncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_PreTruncate(struct vcache *avc, int alen, AFS_UCRED *acred) { page_t *pp; int pageOffset = (alen & PAGEOFFSET); @@ -187,7 +187,7 @@ osi_VM_PreTruncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) * Pageins are blocked (activeV is raised). */ void -osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) { /* * It's OK to specify afs_putapage here, even though we aren't holding diff --git a/src/afs/SOLARIS/osi_vnodeops.c b/src/afs/SOLARIS/osi_vnodeops.c index fdfa90535..e2302db2f 100644 --- a/src/afs/SOLARIS/osi_vnodeops.c +++ b/src/afs/SOLARIS/osi_vnodeops.c @@ -85,7 +85,7 @@ int afs_pvn_vptrunc; int afs_addmap(register struct vnode *avp, offset_t offset, struct as *asp, caddr_t addr, int length, int prot, int maxprot, int flags, - struct AFS_UCRED *credp) + AFS_UCRED *credp) { /* XXX What should we do here?? XXX */ return (0); @@ -94,7 +94,7 @@ afs_addmap(register struct vnode *avp, offset_t offset, struct as *asp, int afs_delmap(register struct vnode *avp, offset_t offset, struct as *asp, caddr_t addr, int length, int prot, int maxprot, int flags, - struct AFS_UCRED *credp) + AFS_UCRED *credp) { /* XXX What should we do here?? XXX */ return (0); @@ -103,11 +103,11 @@ afs_delmap(register struct vnode *avp, offset_t offset, struct as *asp, #ifdef AFS_SUN510_ENV int afs_vmread(register struct vnode *avp, struct uio *auio, int ioflag, - struct AFS_UCRED *acred, caller_context_t *ct) + AFS_UCRED *acred, caller_context_t *ct) #else int afs_vmread(register struct vnode *avp, struct uio *auio, int ioflag, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #endif { register int code; @@ -124,11 +124,11 @@ afs_vmread(register struct vnode *avp, struct uio *auio, int ioflag, #ifdef AFS_SUN510_ENV int afs_vmwrite(register struct vnode *avp, struct uio *auio, int ioflag, - struct AFS_UCRED *acred, caller_context_t *ct) + AFS_UCRED *acred, caller_context_t *ct) #else int afs_vmwrite(register struct vnode *avp, struct uio *auio, int ioflag, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #endif { register int code; @@ -144,7 +144,7 @@ afs_vmwrite(register struct vnode *avp, struct uio *auio, int ioflag, int afs_getpage(struct vnode *vp, offset_t off, u_int len, u_int *protp, struct page *pl[], u_int plsz, struct seg *seg, caddr_t addr, - enum seg_rw rw, struct AFS_UCRED *acred) + enum seg_rw rw, AFS_UCRED *acred) { register afs_int32 code = 0; AFS_STATCNT(afs_getpage); @@ -187,11 +187,11 @@ int #if defined(AFS_SUN56_ENV) afs_GetOnePage(struct vnode *vp, u_offset_t off, u_int alen, u_int *protp, struct page *pl[], u_int plsz, struct seg *seg, caddr_t addr, - enum seg_rw rw, struct AFS_UCRED *acred) + enum seg_rw rw, AFS_UCRED *acred) #else afs_GetOnePage(struct vnode *vp, u_int off, u_int alen, u_int *protp, struct page *pl[], u_int plsz, struct seg *seg, caddr_t addr, - enum seg_rw rw, struct AFS_UCRED *acred) + enum seg_rw rw, AFS_UCRED *acred) #endif { register struct page *page; @@ -479,7 +479,7 @@ afs_GetOnePage(struct vnode *vp, u_int off, u_int alen, u_int *protp, int afs_putpage(struct vnode *vp, offset_t off, u_int len, int flags, - struct AFS_UCRED *cred) + AFS_UCRED *cred) { struct vcache *avc; struct page *pages; @@ -584,13 +584,13 @@ afs_putpage(struct vnode *vp, offset_t off, u_int len, int flags, int #if defined(AFS_SUN58_ENV) afs_putapage(struct vnode *vp, struct page *pages, u_offset_t * offp, - size_t * lenp, int flags, struct AFS_UCRED *credp) + size_t * lenp, int flags, AFS_UCRED *credp) #elif defined(AFS_SUN56_ENV) afs_putapage(struct vnode *vp, struct page *pages, u_offset_t * offp, - u_int * lenp, int flags, struct AFS_UCRED *credp) + u_int * lenp, int flags, AFS_UCRED *credp) #else afs_putapage(struct vnode *vp, struct page *pages, u_int * offp, - u_int * lenp, int flags, struct AFS_UCRED *credp) + u_int * lenp, int flags, AFS_UCRED *credp) #endif { struct buf *tbuf; @@ -646,7 +646,7 @@ afs_putapage(struct vnode *vp, struct page *pages, u_int * offp, int afs_nfsrdwr(register struct vcache *avc, struct uio *auio, enum uio_rw arw, - int ioflag, struct AFS_UCRED *acred) + int ioflag, AFS_UCRED *acred) { register afs_int32 code; afs_int32 code2; @@ -1009,7 +1009,7 @@ afs_nfsrdwr(register struct vcache *avc, struct uio *auio, enum uio_rw arw, } int -afs_map(struct vnode *vp, offset_t off, struct as *as, caddr_t *addr, u_int len, u_char prot, u_char maxprot, u_int flags, struct AFS_UCRED *cred) +afs_map(struct vnode *vp, offset_t off, struct as *as, caddr_t *addr, u_int len, u_char prot, u_char maxprot, u_int flags, AFS_UCRED *cred) { struct segvn_crargs crargs; register afs_int32 code; @@ -1101,7 +1101,7 @@ afs_map(struct vnode *vp, offset_t off, struct as *as, caddr_t *addr, u_int len, */ int afs_pathconf(struct vnode *vp, int cmd, u_long *outdatap, - register struct AFS_UCRED *credp) + register AFS_UCRED *credp) { AFS_STATCNT(afs_cntl); switch (cmd) { @@ -1167,13 +1167,13 @@ afs_seek(struct vnode *vnp, offset_t ooff, offset_t *noffp) int #ifdef AFS_SUN59_ENV afs_frlock(struct vnode *vnp, int cmd, struct flock64 *ap, int flag, - offset_t off, struct flk_callback *flkcb, struct AFS_UCRED *credp) + offset_t off, struct flk_callback *flkcb, AFS_UCRED *credp) #elif defined(AFS_SUN56_ENV) afs_frlock(struct vnode *vnp, int cmd, struct flock64 *ap, int flag, - offset_t off, struct AFS_UCRED *credp) + offset_t off, AFS_UCRED *credp) #else afs_frlock(struct vnode *vnp, int cmd, struct flock *ap, int flag, - offset_t off, struct AFS_UCRED *credp) + offset_t off, AFS_UCRED *credp) #endif { register afs_int32 code = 0; @@ -1215,10 +1215,10 @@ afs_frlock(struct vnode *vnp, int cmd, struct flock *ap, int flag, int #if defined(AFS_SUN56_ENV) afs_space(struct vnode *vnp, int cmd, struct flock64 *ap, int flag, - offset_t off, struct AFS_UCRED *credp) + offset_t off, AFS_UCRED *credp) #else afs_space(struct vnode *vnp, int cmd, struct flock *ap, int flag, - offset_t off, struct AFS_UCRED *credp) + offset_t off, AFS_UCRED *credp) #endif { register afs_int32 code = EINVAL; @@ -1329,55 +1329,55 @@ afs_getsecattr(struct vnode *vp, vsecattr_t *vsecattr, int flag, struct cred *cr #ifdef AFS_GLOBAL_SUNLOCK extern int gafs_open(register struct vcache **avcp, afs_int32 aflags, - struct AFS_UCRED *acred); + AFS_UCRED *acred); extern int gafs_close(register struct vcache *avc, afs_int32 aflags, - int count, offset_t offset, struct AFS_UCRED *acred); + int count, offset_t offset, AFS_UCRED *acred); extern int afs_ioctl(struct vnode *vnp, int com, int arg, int flag, cred_t *credp, int *rvalp); extern int gafs_access(register struct vcache *avc, register afs_int32 amode, - int flags, struct AFS_UCRED *acred); + int flags, AFS_UCRED *acred); extern int gafs_getattr(register struct vcache *avc, register struct vattr *attrs, int flags, - struct AFS_UCRED *acred); + AFS_UCRED *acred); extern int gafs_setattr(register struct vcache *avc, register struct vattr *attrs, int flags, - struct AFS_UCRED *acred); + AFS_UCRED *acred); extern int gafs_lookup(register struct vcache *adp, char *aname, register struct vcache **avcp, struct pathname *pnp, - int flags, struct vnode *rdir, struct AFS_UCRED *acred); + int flags, struct vnode *rdir, AFS_UCRED *acred); extern int gafs_remove(register struct vcache *adp, char *aname, - struct AFS_UCRED *acred); + AFS_UCRED *acred); extern int gafs_link(register struct vcache *adp, register struct vcache *avc, - char *aname, struct AFS_UCRED *acred); + char *aname, AFS_UCRED *acred); extern int gafs_rename(register struct vcache *aodp, char *aname1, register struct vcache *andp, char *aname2, - struct AFS_UCRED *acred); + AFS_UCRED *acred); extern int gafs_symlink(register struct vcache *adp, char *aname, struct vattr *attrs, register char *atargetName, - struct AFS_UCRED *acred); + AFS_UCRED *acred); extern int gafs_rmdir(register struct vcache *adp, char *aname, - struct vnode *cdirp, struct AFS_UCRED *acred); + struct vnode *cdirp, AFS_UCRED *acred); extern int gafs_mkdir(register struct vcache *adp, char *aname, struct vattr *attrs, register struct vcache **avcp, - struct AFS_UCRED *acred); + AFS_UCRED *acred); extern int #ifdef AFS_SUN53_ENV -gafs_fsync(register struct vcache *avc, int flag, struct AFS_UCRED *acred); +gafs_fsync(register struct vcache *avc, int flag, AFS_UCRED *acred); #else -gafs_fsync(register struct vcache *avc, struct AFS_UCRED *acred); +gafs_fsync(register struct vcache *avc, AFS_UCRED *acred); #endif extern int gafs_readlink(register struct vcache *avc, struct uio *auio, - struct AFS_UCRED *acred); + AFS_UCRED *acred); extern int gafs_readdir(register struct vcache *avc, struct uio *auio, - struct AFS_UCRED *acred, int *eofp); + AFS_UCRED *acred, int *eofp); extern void gafs_inactive(register struct vcache *avc, - struct AFS_UCRED *acred); + AFS_UCRED *acred); extern int gafs_fid(struct vcache *avc, struct fid **fidpp); extern int gafs_create(register struct vcache *adp, char *aname, struct vattr *attrs, enum vcexcl aexcl, int amode, - struct vcache **avcp, struct AFS_UCRED *acred); + struct vcache **avcp, AFS_UCRED *acred); extern int afs_pathconf(struct vnode *vp, int cmd, u_long *outdatap, - register struct AFS_UCRED *credp); + register AFS_UCRED *credp); #if defined(AFS_SUN511_ENV) /* The following list must always be NULL-terminated */ @@ -1532,7 +1532,7 @@ struct vnodeops *afs_ops = &Afs_vnodeops; int gafs_open(register struct vcache **avcp, afs_int32 aflags, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; @@ -1544,7 +1544,7 @@ gafs_open(register struct vcache **avcp, afs_int32 aflags, int gafs_close(register struct vcache *avc, afs_int32 aflags, int count, - offset_t offset, struct AFS_UCRED *acred) + offset_t offset, AFS_UCRED *acred) { register int code; @@ -1556,7 +1556,7 @@ gafs_close(register struct vcache *avc, afs_int32 aflags, int count, int gafs_getattr(register struct vcache *avc, register struct vattr *attrs, - int flags, struct AFS_UCRED *acred) + int flags, AFS_UCRED *acred) { register int code; @@ -1569,7 +1569,7 @@ gafs_getattr(register struct vcache *avc, register struct vattr *attrs, int gafs_setattr(register struct vcache *avc, register struct vattr *attrs, - int flags, struct AFS_UCRED *acred) + int flags, AFS_UCRED *acred) { register int code; @@ -1582,7 +1582,7 @@ gafs_setattr(register struct vcache *avc, register struct vattr *attrs, int gafs_access(register struct vcache *avc, register afs_int32 amode, int flags, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; @@ -1596,7 +1596,7 @@ gafs_access(register struct vcache *avc, register afs_int32 amode, int flags, int gafs_lookup(register struct vcache *adp, char *aname, register struct vcache **avcp, struct pathname *pnp, int flags, - struct vnode *rdir, struct AFS_UCRED *acred) + struct vnode *rdir, AFS_UCRED *acred) { register int code; @@ -1610,7 +1610,7 @@ gafs_lookup(register struct vcache *adp, char *aname, int gafs_create(register struct vcache *adp, char *aname, struct vattr *attrs, enum vcexcl aexcl, int amode, struct vcache **avcp, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; @@ -1621,7 +1621,7 @@ gafs_create(register struct vcache *adp, char *aname, struct vattr *attrs, } int -gafs_remove(register struct vcache *adp, char *aname, struct AFS_UCRED *acred) +gafs_remove(register struct vcache *adp, char *aname, AFS_UCRED *acred) { register int code; @@ -1633,7 +1633,7 @@ gafs_remove(register struct vcache *adp, char *aname, struct AFS_UCRED *acred) int gafs_link(register struct vcache *adp, register struct vcache *avc, - char *aname, struct AFS_UCRED *acred) + char *aname, AFS_UCRED *acred) { register int code; @@ -1646,7 +1646,7 @@ gafs_link(register struct vcache *adp, register struct vcache *avc, int gafs_rename(register struct vcache *aodp, char *aname1, register struct vcache *andp, char *aname2, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; @@ -1678,7 +1678,7 @@ gafs_rename(register struct vcache *aodp, char *aname1, int gafs_mkdir(register struct vcache *adp, char *aname, struct vattr *attrs, - register struct vcache **avcp, struct AFS_UCRED *acred) + register struct vcache **avcp, AFS_UCRED *acred) { register int code; @@ -1690,7 +1690,7 @@ gafs_mkdir(register struct vcache *adp, char *aname, struct vattr *attrs, int gafs_rmdir(register struct vcache *adp, char *aname, struct vnode *cdirp, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register int code; @@ -1703,7 +1703,7 @@ gafs_rmdir(register struct vcache *adp, char *aname, struct vnode *cdirp, int gafs_readdir(register struct vcache *avc, struct uio *auio, - struct AFS_UCRED *acred, int *eofp) + AFS_UCRED *acred, int *eofp) { register int code; @@ -1715,7 +1715,7 @@ gafs_readdir(register struct vcache *avc, struct uio *auio, int gafs_symlink(register struct vcache *adp, char *aname, struct vattr *attrs, - register char *atargetName, struct AFS_UCRED *acred) + register char *atargetName, AFS_UCRED *acred) { register int code; @@ -1727,7 +1727,7 @@ gafs_symlink(register struct vcache *adp, char *aname, struct vattr *attrs, int -gafs_readlink(register struct vcache *avc, struct uio *auio, struct AFS_UCRED *acred) +gafs_readlink(register struct vcache *avc, struct uio *auio, AFS_UCRED *acred) { register int code; @@ -1739,9 +1739,9 @@ gafs_readlink(register struct vcache *avc, struct uio *auio, struct AFS_UCRED *a int #ifdef AFS_SUN53_ENV -gafs_fsync(register struct vcache *avc, int flag, struct AFS_UCRED *acred) +gafs_fsync(register struct vcache *avc, int flag, AFS_UCRED *acred) #else -gafs_fsync(register struct vcache *avc, struct AFS_UCRED *acred) +gafs_fsync(register struct vcache *avc, AFS_UCRED *acred) #endif { register int code; @@ -1757,7 +1757,7 @@ gafs_fsync(register struct vcache *avc, struct AFS_UCRED *acred) } int -afs_inactive(struct vcache *avc, struct AFS_UCRED *acred) +afs_inactive(struct vcache *avc, AFS_UCRED *acred) { struct vnode *vp = AFSTOV(avc); if (afs_shuttingdown) @@ -1797,7 +1797,7 @@ afs_inactive(struct vcache *avc, struct AFS_UCRED *acred) } void -gafs_inactive(register struct vcache *avc, struct AFS_UCRED *acred) +gafs_inactive(register struct vcache *avc, AFS_UCRED *acred) { AFS_GLOCK(); (void)afs_inactive(avc, acred); diff --git a/src/afs/UKERNEL/afs_usrops.c b/src/afs/UKERNEL/afs_usrops.c index ce597ca94..9ee502117 100644 --- a/src/afs/UKERNEL/afs_usrops.c +++ b/src/afs/UKERNEL/afs_usrops.c @@ -1030,7 +1030,7 @@ afs_osi_MapStrategy(int (*aproc) (struct usr_buf *), struct usr_buf *bp) } void -osi_FlushPages(register struct vcache *avc, struct AFS_UCRED *credp) +osi_FlushPages(register struct vcache *avc, AFS_UCRED *credp) { ObtainSharedLock(&avc->lock, 555); if ((hcmp((avc->f.m.DataVersion), (avc->mapDV)) <= 0) diff --git a/src/afs/UKERNEL/osi_groups.c b/src/afs/UKERNEL/osi_groups.c index 6662dc60d..7a3cc0805 100644 --- a/src/afs/UKERNEL/osi_groups.c +++ b/src/afs/UKERNEL/osi_groups.c @@ -28,7 +28,7 @@ afs_xsetgroups(void) } static int -afs_getgroups(struct AFS_UCRED *cred, gid_t * gidset) +afs_getgroups(AFS_UCRED *cred, gid_t * gidset) { int ngrps, savengrps; gid_t *gp; @@ -46,7 +46,7 @@ afs_getgroups(struct AFS_UCRED *cred, gid_t * gidset) static int -afs_setgroups(struct AFS_UCRED **cred, int ngroups, gid_t * gidset, +afs_setgroups(AFS_UCRED **cred, int ngroups, gid_t * gidset, int change_parent) { gid_t *gp; @@ -56,7 +56,7 @@ afs_setgroups(struct AFS_UCRED **cred, int ngroups, gid_t * gidset, if (ngroups > NGROUPS_MAX) return EINVAL; if (!change_parent) - *cred = (struct AFS_UCRED *)crcopy(*cred); + *cred = (AFS_UCRED *)crcopy(*cred); (*cred)->cr_ngroups = ngroups; gp = (*cred)->cr_groups; while (ngroups--) diff --git a/src/afs/UKERNEL/osi_machdep.h b/src/afs/UKERNEL/osi_machdep.h index 7abe45386..646f42cfa 100644 --- a/src/afs/UKERNEL/osi_machdep.h +++ b/src/afs/UKERNEL/osi_machdep.h @@ -26,7 +26,7 @@ #define OSI_WAITHASH_SIZE 128 /* must be power of two */ #define MAX_HOSTADDR 32 -#define AFS_UCRED usr_ucred +#define AFS_UCRED struct usr_ucred #define AFS_KALLOC(A) afs_osi_Alloc(A) diff --git a/src/afs/UKERNEL/osi_vm.c b/src/afs/UKERNEL/osi_vm.c index b26b7fbe2..e695dd351 100644 --- a/src/afs/UKERNEL/osi_vm.c +++ b/src/afs/UKERNEL/osi_vm.c @@ -16,7 +16,7 @@ #include "afs/afs_stats.h" /* statistics */ void -osi_VM_Truncate(struct vcache *avc, int alen, struct AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) { return; } @@ -34,13 +34,13 @@ osi_VM_StoreAllSegments(struct vcache *avc) } void -osi_VM_TryToSmush(struct vcache *avc, struct AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) { return; } void -osi_VM_FlushPages(struct vcache *avc, struct AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) { return; } diff --git a/src/afs/UKERNEL/osi_vnodeops.c b/src/afs/UKERNEL/osi_vnodeops.c index d04013f1a..f2d6d55c8 100644 --- a/src/afs/UKERNEL/osi_vnodeops.c +++ b/src/afs/UKERNEL/osi_vnodeops.c @@ -31,7 +31,7 @@ afs_vrdwr(struct usr_vnode *avc, struct usr_uio *uio, int rw, int io, } int -afs_inactive(struct vcache *avc, struct AFS_UCRED *acred) +afs_inactive(struct vcache *avc, AFS_UCRED *acred) { if (afs_shuttingdown) return 0; diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h index a0c9d54cd..858141df1 100644 --- a/src/afs/UKERNEL/sysincludes.h +++ b/src/afs/UKERNEL/sysincludes.h @@ -1221,44 +1221,44 @@ struct usr_socket { ((sizeof (struct usr_dirent)+4 - (MAXNAMLEN+1)) + (((len)+1 + 3) &~ 3)) struct vcache; -#define AFS_UCRED usr_ucred +#define AFS_UCRED struct usr_ucred #define AFS_FLOCK flock struct usr_vnodeops { - int (*vn_open) (struct vcache **, afs_int32, struct AFS_UCRED *); - int (*vn_close) (struct vcache *, afs_int32, struct AFS_UCRED *); + int (*vn_open) (struct vcache **, afs_int32, AFS_UCRED *); + int (*vn_close) (struct vcache *, afs_int32, AFS_UCRED *); int (*vn_rdwr) (struct usr_vnode *avc, struct usr_uio *uio, int rw, int io, struct usr_ucred *cred); int (*vn_ioctl) (void); int (*vn_select) (void); - int (*vn_getattr) (struct vcache *avc, struct vattr *, struct AFS_UCRED *); - int (*vn_setattr) (struct vcache *avc, struct vattr *, struct AFS_UCRED *); - int (*vn_access) (struct vcache *avc, afs_int32, struct AFS_UCRED *); + int (*vn_getattr) (struct vcache *avc, struct vattr *, AFS_UCRED *); + int (*vn_setattr) (struct vcache *avc, struct vattr *, AFS_UCRED *); + int (*vn_access) (struct vcache *avc, afs_int32, AFS_UCRED *); int (*vn_lookup) (struct vcache *adp, char *, struct vcache **, - struct AFS_UCRED *, int); + AFS_UCRED *, int); int (*vn_create) (struct vcache *adp, char *, struct vattr *, - enum vcexcl, int, struct vcache **, struct AFS_UCRED *); - int (*vn_remove) (struct vcache *adp, char *, struct AFS_UCRED *); + enum vcexcl, int, struct vcache **, AFS_UCRED *); + int (*vn_remove) (struct vcache *adp, char *, AFS_UCRED *); int (*vn_link) (struct vcache *avc, struct vcache *adp, char *, - struct AFS_UCRED *); + AFS_UCRED *); int (*vn_rename) (struct vcache *aodp, char *, struct vcache *, char *, - struct AFS_UCRED *); + AFS_UCRED *); int (*vn_mkdir) (struct vcache *adp, char *, struct vattr *, - struct vcache **, struct AFS_UCRED *); - int (*vn_rmdir) (struct vcache *adp, char *, struct AFS_UCRED *); - int (*vn_readdir) (struct vcache *avc, struct uio *, struct AFS_UCRED *); + struct vcache **, AFS_UCRED *); + int (*vn_rmdir) (struct vcache *adp, char *, AFS_UCRED *); + int (*vn_readdir) (struct vcache *avc, struct uio *, AFS_UCRED *); int (*vn_symlink) (struct vcache *adp, char *, struct vattr *, char *, - struct AFS_UCRED *); - int (*vn_readlink) (struct vcache *avc, struct uio *, struct AFS_UCRED *); - int (*vn_fsync) (struct vcache *avc, struct AFS_UCRED *); - int (*vn_inactive) (struct vcache *avc, struct AFS_UCRED *acred); + AFS_UCRED *); + int (*vn_readlink) (struct vcache *avc, struct uio *, AFS_UCRED *); + int (*vn_fsync) (struct vcache *avc, AFS_UCRED *); + int (*vn_inactive) (struct vcache *avc, AFS_UCRED *acred); int (*vn_bmap) (void); int (*vn_strategy) (void); int (*vn_bread) (void); int (*vn_brelse) (void); int (*vn_lockctl) (struct vcache *, struct AFS_FLOCK *, int, - struct AFS_UCRED *); + AFS_UCRED *); int (*vn_fid) (struct vcache *avc, struct fid **); }; diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c index 13c309c97..b602673a8 100644 --- a/src/afs/VNOPS/afs_vnop_access.c +++ b/src/afs/VNOPS/afs_vnop_access.c @@ -191,11 +191,11 @@ afs_AccessOK(struct vcache *avc, afs_int32 arights, struct vrequest *areq, #if defined(AFS_SUN5_ENV) || (defined(AFS_SGI_ENV) && !defined(AFS_SGI65_ENV)) int afs_access(OSI_VC_DECL(avc), register afs_int32 amode, int flags, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #else int afs_access(OSI_VC_DECL(avc), register afs_int32 amode, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #endif { register afs_int32 code; @@ -351,7 +351,7 @@ afs_access(OSI_VC_DECL(avc), register afs_int32 amode, */ int afs_getRights(OSI_VC_DECL(avc), register afs_int32 arights, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register afs_int32 code; struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c index ff2570cde..e098ba7fc 100644 --- a/src/afs/VNOPS/afs_vnop_attrs.c +++ b/src/afs/VNOPS/afs_vnop_attrs.c @@ -182,10 +182,10 @@ afs_CopyOutAttrs(register struct vcache *avc, register struct vattr *attrs) #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) int afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, int flags, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #else int -afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, struct AFS_UCRED *acred) +afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, AFS_UCRED *acred) #endif { afs_int32 code; @@ -438,11 +438,11 @@ afs_VAttrToAS(register struct vcache *avc, register struct vattr *av, #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) int afs_setattr(OSI_VC_DECL(avc), register struct vattr *attrs, int flags, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #else int afs_setattr(OSI_VC_DECL(avc), register struct vattr *attrs, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_create.c b/src/afs/VNOPS/afs_vnop_create.c index 8c2f5d5af..38b184f58 100644 --- a/src/afs/VNOPS/afs_vnop_create.c +++ b/src/afs/VNOPS/afs_vnop_create.c @@ -32,12 +32,12 @@ #ifdef AFS_SGI64_ENV int afs_create(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, int flags, - int amode, struct vcache **avcp, struct AFS_UCRED *acred) + int amode, struct vcache **avcp, AFS_UCRED *acred) #else /* AFS_SGI64_ENV */ 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 */ { afs_int32 origCBs, origZaps, finalZaps; diff --git a/src/afs/VNOPS/afs_vnop_dirops.c b/src/afs/VNOPS/afs_vnop_dirops.c index cd9c8f789..e84fa22cf 100644 --- a/src/afs/VNOPS/afs_vnop_dirops.c +++ b/src/afs/VNOPS/afs_vnop_dirops.c @@ -35,7 +35,7 @@ extern afs_rwlock_t afs_xcbhash; 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) { struct vrequest treq; register afs_int32 code; @@ -256,9 +256,9 @@ int /* don't set CDirty in here because RPC is called synchronously */ #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) afs_rmdir(OSI_VC_DECL(adp), char *aname, struct vnode *cdirp, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #else -afs_rmdir(OSI_VC_DECL(adp), char *aname, struct AFS_UCRED *acred) +afs_rmdir(OSI_VC_DECL(adp), char *aname, AFS_UCRED *acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c index 885f4e07f..22f4f4b8b 100644 --- a/src/afs/VNOPS/afs_vnop_flock.c +++ b/src/afs/VNOPS/afs_vnop_flock.c @@ -510,14 +510,14 @@ DoLockWarning(void) #ifdef AFS_OSF_ENV 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) 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 u_int clid = 0; int afs_lockctl(struct vcache * avc, struct AFS_FLOCK * af, int acmd, - struct AFS_UCRED * acred) + AFS_UCRED * acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_link.c b/src/afs/VNOPS/afs_vnop_link.c index 0c68a82ed..824217894 100644 --- a/src/afs/VNOPS/afs_vnop_link.c +++ b/src/afs/VNOPS/afs_vnop_link.c @@ -32,10 +32,10 @@ extern afs_rwlock_t afs_xcbhash; int #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) afs_link(OSI_VC_DECL(adp), struct vcache *avc, char *aname, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #else afs_link(struct vcache *avc, OSI_VC_DECL(adp), char *aname, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c index 7b3ef680e..8d0af3983 100644 --- a/src/afs/VNOPS/afs_vnop_lookup.c +++ b/src/afs/VNOPS/afs_vnop_lookup.c @@ -1197,13 +1197,13 @@ static int AFSDOBULK = 1; int #ifdef AFS_OSF_ENV -afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct AFS_UCRED *acred, int opflag, int wantparent) +afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, AFS_UCRED *acred, int opflag, int wantparent) #elif defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) -afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct pathname *pnp, int flags, struct vnode *rdir, struct AFS_UCRED *acred) +afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct pathname *pnp, int flags, struct vnode *rdir, AFS_UCRED *acred) #elif defined(UKERNEL) -afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct AFS_UCRED *acred, int flags) +afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, AFS_UCRED *acred, int flags) #else -afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct AFS_UCRED *acred) +afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, AFS_UCRED *acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_open.c b/src/afs/VNOPS/afs_vnop_open.c index 304c0bc49..5d18d97ab 100644 --- a/src/afs/VNOPS/afs_vnop_open.c +++ b/src/afs/VNOPS/afs_vnop_open.c @@ -34,9 +34,9 @@ int #ifdef AFS_SGI64_ENV afs_open(bhv_desc_t * bhv, struct vcache **avcp, afs_int32 aflags, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #else -afs_open(struct vcache **avcp, afs_int32 aflags, struct AFS_UCRED *acred) +afs_open(struct vcache **avcp, afs_int32 aflags, AFS_UCRED *acred) #endif { register afs_int32 code; diff --git a/src/afs/VNOPS/afs_vnop_read.c b/src/afs/VNOPS/afs_vnop_read.c index 27e518ce1..e12db580f 100644 --- a/src/afs/VNOPS/afs_vnop_read.c +++ b/src/afs/VNOPS/afs_vnop_read.c @@ -44,11 +44,11 @@ extern afs_hyper_t afs_indexCounter; /* Fake time for marking index */ /* Forward declarations */ void afs_PrefetchChunk(struct vcache *avc, struct dcache *adc, - struct AFS_UCRED *acred, struct vrequest *areq); + AFS_UCRED *acred, struct vrequest *areq); int afs_MemRead(register struct vcache *avc, struct uio *auio, - struct AFS_UCRED *acred, daddr_t albn, struct buf **abpp, + AFS_UCRED *acred, daddr_t albn, struct buf **abpp, int noLock) { afs_size_t totalLength; @@ -421,7 +421,7 @@ afs_MemRead(register struct vcache *avc, struct uio *auio, */ void afs_PrefetchChunk(struct vcache *avc, struct dcache *adc, - struct AFS_UCRED *acred, struct vrequest *areq) + AFS_UCRED *acred, struct vrequest *areq) { register struct dcache *tdc; afs_size_t offset; @@ -493,7 +493,7 @@ afs_PrefetchChunk(struct vcache *avc, struct dcache *adc, int afs_UFSRead(register struct vcache *avc, struct uio *auio, - struct AFS_UCRED *acred, daddr_t albn, struct buf **abpp, + AFS_UCRED *acred, daddr_t albn, struct buf **abpp, int noLock) { afs_size_t totalLength; diff --git a/src/afs/VNOPS/afs_vnop_readdir.c b/src/afs/VNOPS/afs_vnop_readdir.c index c602250d7..b1d8f8b92 100644 --- a/src/afs/VNOPS/afs_vnop_readdir.c +++ b/src/afs/VNOPS/afs_vnop_readdir.c @@ -550,13 +550,13 @@ afs_bulkstat_send(struct vcache *avc, struct vrequest *req) int #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) -afs_readdir(OSI_VC_DECL(avc), struct uio *auio, struct AFS_UCRED *acred, +afs_readdir(OSI_VC_DECL(avc), struct uio *auio, AFS_UCRED *acred, int *eofp) #else #if defined(AFS_HPUX100_ENV) -afs_readdir2(OSI_VC_DECL(avc), struct uio *auio, struct AFS_UCRED *acred) +afs_readdir2(OSI_VC_DECL(avc), struct uio *auio, AFS_UCRED *acred) #else -afs_readdir(OSI_VC_DECL(avc), struct uio *auio, struct AFS_UCRED *acred) +afs_readdir(OSI_VC_DECL(avc), struct uio *auio, AFS_UCRED *acred) #endif #endif { @@ -905,11 +905,11 @@ afs_readdir(OSI_VC_DECL(avc), struct uio *auio, struct AFS_UCRED *acred) #if defined(AFS_HPUX_ENV) || defined(AFS_OSF_ENV) #ifdef AFS_OSF_ENV int -afs1_readdir(struct vcache *avc, struct uio *auio, struct AFS_UCRED *acred, +afs1_readdir(struct vcache *avc, struct uio *auio, AFS_UCRED *acred, int *eofp) #else int -afs1_readdir(struct vcache *avc, struct uio *auio, struct AFS_UCRED *acred) +afs1_readdir(struct vcache *avc, struct uio *auio, AFS_UCRED *acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c index 818c0e7f4..124d1c9cb 100644 --- a/src/afs/VNOPS/afs_vnop_remove.c +++ b/src/afs/VNOPS/afs_vnop_remove.c @@ -96,7 +96,7 @@ afs_IsWired(register struct vcache *avc) int afsremove(register struct vcache *adp, register struct dcache *tdc, - register struct vcache *tvc, char *aname, struct AFS_UCRED *acred, + register struct vcache *tvc, char *aname, AFS_UCRED *acred, struct vrequest *treqp) { register afs_int32 code = 0; @@ -213,7 +213,7 @@ char *Tnam1; /* Note that we don't set CDirty here, this is OK because the unlink * RPC is called synchronously */ int -afs_remove(OSI_VC_DECL(adp), char *aname, struct AFS_UCRED *acred) +afs_remove(OSI_VC_DECL(adp), char *aname, AFS_UCRED *acred) { struct vrequest treq; register struct dcache *tdc; @@ -479,7 +479,7 @@ afs_remove(OSI_VC_DECL(adp), char *aname, struct AFS_UCRED *acred) int afs_remunlink(register struct vcache *avc, register int doit) { - struct AFS_UCRED *cred; + AFS_UCRED *cred; char *unlname; struct vcache *adp; struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_rename.c b/src/afs/VNOPS/afs_vnop_rename.c index 5c6a0577a..ae590b38a 100644 --- a/src/afs/VNOPS/afs_vnop_rename.c +++ b/src/afs/VNOPS/afs_vnop_rename.c @@ -32,7 +32,7 @@ extern afs_rwlock_t afs_xcbhash; int afsrename(struct vcache *aodp, char *aname1, struct vcache *andp, - char *aname2, struct AFS_UCRED *acred, struct vrequest *areq) + char *aname2, AFS_UCRED *acred, struct vrequest *areq) { register struct afs_conn *tc; register afs_int32 code = 0; @@ -444,9 +444,9 @@ afsrename(struct vcache *aodp, char *aname1, struct vcache *andp, int #if defined(AFS_SGI_ENV) -afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp, char *aname2, struct pathname *npnp, struct AFS_UCRED *acred) +afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp, char *aname2, struct pathname *npnp, AFS_UCRED *acred) #else -afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp, char *aname2, struct AFS_UCRED *acred) +afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp, char *aname2, AFS_UCRED *acred) #endif { register afs_int32 code; diff --git a/src/afs/VNOPS/afs_vnop_strategy.c b/src/afs/VNOPS/afs_vnop_strategy.c index 21385c7ed..63bde22e7 100644 --- a/src/afs/VNOPS/afs_vnop_strategy.c +++ b/src/afs/VNOPS/afs_vnop_strategy.c @@ -28,7 +28,7 @@ #if defined(AFS_SUN5_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) -int afs_ustrategy(register struct buf *abp, struct AFS_UCRED *credp) +int afs_ustrategy(register struct buf *abp, AFS_UCRED *credp) #else int afs_ustrategy(register struct buf *abp) #endif @@ -42,7 +42,7 @@ int afs_ustrategy(register struct buf *abp) #ifdef AFS_AIX41_ENV struct ucred *credp; #else - struct AFS_UCRED *credp = u.u_cred; + AFS_UCRED *credp = u.u_cred; #endif #endif diff --git a/src/afs/VNOPS/afs_vnop_symlink.c b/src/afs/VNOPS/afs_vnop_symlink.c index c849163cc..07f605613 100644 --- a/src/afs/VNOPS/afs_vnop_symlink.c +++ b/src/afs/VNOPS/afs_vnop_symlink.c @@ -68,7 +68,7 @@ afs_DisconCreateSymlink(struct vcache *avc, char *aname, /* don't set CDirty in here because RPC is called synchronously */ int afs_symlink(OSI_VC_DECL(adp), char *aname, struct vattr *attrs, - char *atargetName, struct AFS_UCRED *acred) + char *atargetName, AFS_UCRED *acred) { afs_uint32 now = 0; struct vrequest treq; @@ -404,7 +404,7 @@ afs_UFSHandleLink(register struct vcache *avc, struct vrequest *areq) } int -afs_readlink(OSI_VC_DECL(avc), struct uio *auio, struct AFS_UCRED *acred) +afs_readlink(OSI_VC_DECL(avc), struct uio *auio, AFS_UCRED *acred) { register afs_int32 code; struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c index b5eb4dc6e..d6c247f5d 100644 --- a/src/afs/VNOPS/afs_vnop_write.c +++ b/src/afs/VNOPS/afs_vnop_write.c @@ -59,7 +59,7 @@ afs_StoreOnLastReference(register struct vcache *avc, avc->opens--; avc->execsOrWriters--; AFS_RELE(AFSTOV(avc)); /* VN_HOLD at set CCore(afs_FakeClose) */ - crfree((struct AFS_UCRED *)avc->linkData); /* "crheld" in afs_FakeClose */ + crfree((AFS_UCRED *)avc->linkData); /* "crheld" in afs_FakeClose */ avc->linkData = NULL; } @@ -97,7 +97,7 @@ afs_StoreOnLastReference(register struct vcache *avc, int afs_MemWrite(register struct vcache *avc, struct uio *auio, int aio, - struct AFS_UCRED *acred, int noLock) + AFS_UCRED *acred, int noLock) { afs_size_t totalLength; afs_size_t transferLength; @@ -309,7 +309,7 @@ afs_MemWrite(register struct vcache *avc, struct uio *auio, int aio, /* called on writes */ int afs_UFSWrite(register struct vcache *avc, struct uio *auio, int aio, - struct AFS_UCRED *acred, int noLock) + AFS_UCRED *acred, int noLock) { afs_size_t totalLength; afs_size_t transferLength; @@ -733,18 +733,18 @@ afs_closex(register struct file *afd) int #if defined(AFS_SGI65_ENV) afs_close(OSI_VC_DECL(avc), afs_int32 aflags, lastclose_t lastclose, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #elif defined(AFS_SGI64_ENV) afs_close(OSI_VC_DECL(avc), afs_int32 aflags, lastclose_t lastclose, - off_t offset, struct AFS_UCRED *acred, struct flid *flp) + off_t offset, AFS_UCRED *acred, struct flid *flp) #elif defined(AFS_SGI_ENV) afs_close(OSI_VC_DECL(avc), afs_int32 aflags, lastclose_t lastclose - off_t offset, struct AFS_UCRED *acred) + off_t offset, AFS_UCRED *acred) #elif defined(AFS_SUN5_ENV) afs_close(OSI_VC_DECL(avc), afs_int32 aflags, int count, offset_t offset, - struct AFS_UCRED *acred) + AFS_UCRED *acred) #else -afs_close(OSI_VC_DECL(avc), afs_int32 aflags, struct AFS_UCRED *acred) +afs_close(OSI_VC_DECL(avc), afs_int32 aflags, AFS_UCRED *acred) #endif { register afs_int32 code; @@ -913,16 +913,16 @@ afs_close(OSI_VC_DECL(avc), afs_int32 aflags, struct AFS_UCRED *acred) int #ifdef AFS_OSF_ENV -afs_fsync(OSI_VC_DECL(avc), int fflags, struct AFS_UCRED *acred, int waitfor) +afs_fsync(OSI_VC_DECL(avc), int fflags, AFS_UCRED *acred, int waitfor) #else /* AFS_OSF_ENV */ #if defined(AFS_SGI_ENV) || defined(AFS_SUN53_ENV) -afs_fsync(OSI_VC_DECL(avc), int flag, struct AFS_UCRED *acred +afs_fsync(OSI_VC_DECL(avc), int flag, AFS_UCRED *acred #ifdef AFS_SGI65_ENV , off_t start, off_t stop #endif /* AFS_SGI65_ENV */ ) #else /* !OSF && !SUN53 && !SGI */ -afs_fsync(OSI_VC_DECL(avc), struct AFS_UCRED *acred) +afs_fsync(OSI_VC_DECL(avc), AFS_UCRED *acred) #endif #endif { diff --git a/src/afs/afs.h b/src/afs/afs.h index 55a7c2e18..27d7645af 100644 --- a/src/afs/afs.h +++ b/src/afs/afs.h @@ -146,7 +146,7 @@ struct sysname_info { #define BUWAIT 4 /* someone is waiting for BUVALID */ struct brequest { struct vcache *vc; /* vnode to use, with vrefcount bumped */ - struct AFS_UCRED *cred; /* credentials to use for operation */ + AFS_UCRED *cred; /* credentials to use for operation */ afs_size_t size_parm[BPARMS]; /* random parameters */ void *ptr_parm[BPARMS]; /* pointer parameters */ afs_int32 code; /* return code */ @@ -850,7 +850,7 @@ struct vcache { #endif /* AFS_SGI_ENV */ afs_int32 vc_error; /* stash write error for this vnode. */ int xlatordv; /* Used by nfs xlator */ - struct AFS_UCRED *uncred; + AFS_UCRED *uncred; int asynchrony; /* num kbytes to store behind */ #ifdef AFS_SUN5_ENV short multiPage; /* count of multi-page getpages in progress */ diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c index fa8ecc877..05b57208e 100644 --- a/src/afs/afs_bypasscache.c +++ b/src/afs/afs_bypasscache.c @@ -130,7 +130,7 @@ extern afs_rwlock_t afs_xcbhash; * existing VM pages for the file. We keep track of the number of * times we go back and forth from caching to bypass. */ -void afs_TransitionToBypass(register struct vcache *avc, register struct AFS_UCRED *acred, int aflags) +void afs_TransitionToBypass(register struct vcache *avc, register AFS_UCRED *acred, int aflags) { afs_int32 code; @@ -205,7 +205,7 @@ done: * throw out any existing VM pages for the file. We keep track of * the number of times we go back and forth from caching to bypass. */ -void afs_TransitionToCaching(register struct vcache *avc, register struct AFS_UCRED *acred, int aflags) +void afs_TransitionToCaching(register struct vcache *avc, register AFS_UCRED *acred, int aflags) { int resetDesire = 0; int setManual = 0; @@ -449,7 +449,7 @@ done: afs_int32 afs_ReadNoCache(register struct vcache *avc, register struct nocache_read_request *bparms, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { afs_int32 code; afs_int32 bcnt; @@ -525,7 +525,7 @@ cleanup: /* Cannot have static linkage--called from BPrefetch (afs_daemons) */ afs_int32 afs_PrefetchNoCache(register struct vcache *avc, - register struct AFS_UCRED *acred, + register AFS_UCRED *acred, register struct nocache_read_request *bparms) { uio_t *auio; diff --git a/src/afs/afs_bypasscache.h b/src/afs/afs_bypasscache.h index 111e6da55..e05f80d76 100644 --- a/src/afs/afs_bypasscache.h +++ b/src/afs/afs_bypasscache.h @@ -112,8 +112,8 @@ extern int cache_bypass_prefetch; extern int cache_bypass_strategy; extern int cache_bypass_threshold; -void afs_TransitionToBypass(register struct vcache *, register struct AFS_UCRED *, int); -void afs_TransitionToCaching(register struct vcache *, register struct AFS_UCRED *, int); +void afs_TransitionToBypass(register struct vcache *, register AFS_UCRED *, int); +void afs_TransitionToCaching(register struct vcache *, register AFS_UCRED *, int); /* Cache strategy permits vnode transition between caching and no-cache-- * currently, this means LARGE_FILES_BYPASS_CACHE. Currently, no pioctl permits @@ -140,11 +140,11 @@ void afs_TransitionToCaching(register struct vcache *, register struct AFS_UCRED /* dispatch a no-cache read request */ afs_int32 afs_ReadNoCache(register struct vcache *avc, register struct nocache_read_request *bparms, - struct AFS_UCRED *acred); + AFS_UCRED *acred); /* no-cache prefetch routine */ afs_int32 -afs_PrefetchNoCache(register struct vcache *avc, register struct AFS_UCRED *acred, +afs_PrefetchNoCache(register struct vcache *avc, register AFS_UCRED *acred, struct nocache_read_request *bparms); diff --git a/src/afs/afs_chunkops.h b/src/afs/afs_chunkops.h index cb5bc557c..e49a5bacc 100644 --- a/src/afs/afs_chunkops.h +++ b/src/afs/afs_chunkops.h @@ -59,10 +59,10 @@ struct afs_cacheOps { afs_int32 len); int (*close) (struct osi_file * fp); int (*vread) (register struct vcache * avc, struct uio * auio, - struct AFS_UCRED * acred, daddr_t albn, struct buf ** abpp, + AFS_UCRED * acred, daddr_t albn, struct buf ** abpp, int noLock); int (*vwrite) (register struct vcache * avc, struct uio * auio, int aio, - struct AFS_UCRED * acred, int noLock); + AFS_UCRED * acred, int noLock); struct dcache *(*GetDSlot) (register afs_int32 aslot, register struct dcache * tmpdc); struct volume *(*GetVolSlot) (void); diff --git a/src/afs/afs_daemons.c b/src/afs/afs_daemons.c index 5dc24329c..8a235a465 100644 --- a/src/afs/afs_daemons.c +++ b/src/afs/afs_daemons.c @@ -629,7 +629,7 @@ afs_BBusy(void) struct brequest * afs_BQueue(register short aopcode, register struct vcache *avc, - afs_int32 dontwait, afs_int32 ause, struct AFS_UCRED *acred, + afs_int32 dontwait, afs_int32 ause, AFS_UCRED *acred, afs_size_t asparm0, afs_size_t asparm1, void *apparm0) { register int i; @@ -1031,7 +1031,7 @@ afs_BackgroundDaemon(void) } if (tb->cred) { crfree(tb->cred); - tb->cred = (struct AFS_UCRED *)0; + tb->cred = (AFS_UCRED *)0; } afs_BRelease(tb); /* this grabs and releases afs_xbrs lock */ MObtainWriteLock(&afs_xbrs, 305); diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c index ff900f1e6..d7f850991 100644 --- a/src/afs/afs_dcache.c +++ b/src/afs/afs_dcache.c @@ -1264,7 +1264,7 @@ afs_PutDCache(register struct dcache *adc) * Both pvnLock and lock are write held. */ void -afs_TryToSmush(register struct vcache *avc, struct AFS_UCRED *acred, int sync) +afs_TryToSmush(register struct vcache *avc, AFS_UCRED *acred, int sync) { register struct dcache *tdc; register int index; diff --git a/src/afs/afs_disconnected.c b/src/afs/afs_disconnected.c index 94fcc737d..098e42666 100644 --- a/src/afs/afs_disconnected.c +++ b/src/afs/afs_disconnected.c @@ -50,7 +50,7 @@ enum { afs_int32 afs_ConflictPolicy = SERVER_WINS; -static void afs_DisconDiscardAllShadows(int, struct AFS_UCRED *); +static void afs_DisconDiscardAllShadows(int, AFS_UCRED *); void afs_DbgListDirEntries(struct VenusFid *afid); @@ -645,7 +645,7 @@ done: * - Reorder vhash and dcaches in their hashes, using the newly acquired fid. */ int afs_ProcessOpCreate(struct vcache *avc, struct vrequest *areq, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { char *tname = NULL, *ttargetName = NULL; struct AFSStoreStatus InStatus; @@ -1095,7 +1095,7 @@ int afs_SendChanges(struct vcache *avc, struct vrequest *areq) * \note For now, it's the request from the PDiscon pioctl. * */ -int afs_ResyncDisconFiles(struct vrequest *areq, struct AFS_UCRED *acred) +int afs_ResyncDisconFiles(struct vrequest *areq, AFS_UCRED *acred) { struct afs_conn *tc; struct vcache *tvc; @@ -1297,7 +1297,7 @@ next_file: */ static void -afs_DisconDiscardAllShadows(int squash, struct AFS_UCRED *acred) { +afs_DisconDiscardAllShadows(int squash, AFS_UCRED *acred) { struct vcache *tvc; while (!QEmpty(&afs_disconShadow)) { @@ -1328,7 +1328,7 @@ afs_DisconDiscardAllShadows(int squash, struct AFS_UCRED *acred) { * */ void -afs_DisconDiscardAll(struct AFS_UCRED *acred) { +afs_DisconDiscardAll(AFS_UCRED *acred) { struct vcache *tvc; ObtainWriteLock(&afs_disconDirtyLock, 717); diff --git a/src/afs/afs_dynroot.c b/src/afs/afs_dynroot.c index 98b82af32..364d7ea47 100644 --- a/src/afs/afs_dynroot.c +++ b/src/afs/afs_dynroot.c @@ -789,7 +789,7 @@ afs_GetDynrootEnable(void) * Remove a temporary symlink entry from /afs. */ int -afs_DynrootVOPRemove(struct vcache *avc, struct AFS_UCRED *acred, char *aname) +afs_DynrootVOPRemove(struct vcache *avc, AFS_UCRED *acred, char *aname) { struct afs_dynSymlink **tpps; struct afs_dynSymlink *tps; @@ -833,7 +833,7 @@ afs_DynrootVOPRemove(struct vcache *avc, struct AFS_UCRED *acred, char *aname) * Create a temporary symlink entry in /afs. */ int -afs_DynrootVOPSymlink(struct vcache *avc, struct AFS_UCRED *acred, +afs_DynrootVOPSymlink(struct vcache *avc, AFS_UCRED *acred, char *aname, char *atargetName) { struct afs_dynSymlink *tps; diff --git a/src/afs/afs_nfsclnt.c b/src/afs/afs_nfsclnt.c index 05d11435b..0c8a63e4c 100644 --- a/src/afs/afs_nfsclnt.c +++ b/src/afs/afs_nfsclnt.c @@ -174,7 +174,7 @@ afs_nfsclient_init(void) */ 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) { @@ -577,7 +577,7 @@ char *afs_nfs_id = "AFSNFSTRANS"; */ int afs_iauth_verify(long id, fsid_t * fsidp, long host, int uid, - struct AFS_UCRED *credp, struct exportinfo *exp) + AFS_UCRED *credp, struct exportinfo *exp) { int code; struct nfsclientpag *nfs_pag; diff --git a/src/afs/afs_nfsdisp.c b/src/afs/afs_nfsdisp.c index e947e6613..619d543e1 100644 --- a/src/afs/afs_nfsdisp.c +++ b/src/afs/afs_nfsdisp.c @@ -246,7 +246,7 @@ acl2_to_afs_call(int which, caddr_t * args, fhandle_t ** fhpp) int afs_nfs2_dispatcher(int type, afs_int32 which, char *argp, struct exportinfo **expp, struct svc_req *rp, - struct AFS_UCRED *crp) + AFS_UCRED *crp) { afs_int32 call = 0; afs_int32 code = 0; @@ -376,8 +376,8 @@ void afs_nfs2_getattr(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_GETATTR, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -391,8 +391,8 @@ void afs_nfs2_setattr(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_SETATTR, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -406,8 +406,8 @@ void afs_nfs2_lookup(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_LOOKUP, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -424,8 +424,8 @@ void afs_nfs2_readlink(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_READLINK, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -439,8 +439,8 @@ void afs_nfs2_read(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_READ, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -454,8 +454,8 @@ void afs_nfs2_write(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_WRITE, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -469,8 +469,8 @@ void afs_nfs2_create(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_CREATE, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -487,8 +487,8 @@ void afs_nfs2_remove(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_REMOVE, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -502,8 +502,8 @@ void afs_nfs2_rename(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_RENAME, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -517,8 +517,8 @@ void afs_nfs2_link(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_LINK, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -532,8 +532,8 @@ void afs_nfs2_symlink(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_SYMLINK, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -547,8 +547,8 @@ void afs_nfs2_mkdir(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_MKDIR, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -565,8 +565,8 @@ void afs_nfs2_rmdir(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_RMDIR, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -580,8 +580,8 @@ void afs_nfs2_readdir(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_READDIR, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -595,8 +595,8 @@ void afs_nfs2_statfs(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(0, RFS_STATFS, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs2_noaccess((struct afs_nfs2_resp *)xp); @@ -631,8 +631,8 @@ void afs_acl2_getacl(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(1, ACLPROC2_GETACL, (char *)args, &exp, rp, crp); if (call > 1) @@ -648,8 +648,8 @@ void afs_acl2_setacl(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(1, ACLPROC2_SETACL, (char *)args, &exp, rp, crp); if (call > 1) @@ -665,8 +665,8 @@ void afs_acl2_getattr(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(1, ACLPROC2_GETATTR, (char *)args, &exp, rp, crp); if (call > 1) @@ -682,8 +682,8 @@ void afs_acl2_access(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(1, ACLPROC2_ACCESS, (char *)args, &exp, rp, crp); if (call > 1) @@ -700,8 +700,8 @@ void afs_acl2_getxattrdir(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs2_dispatcher(1, ACLPROC2_GETXATTRDIR, (char *)args, &exp, rp, crp); if (call > 1) @@ -1025,7 +1025,7 @@ acl3_to_afs_call(int which, caddr_t * args, nfs_fh3 ** fhpp) int afs_nfs3_dispatcher(int type, afs_int32 which, char *argp, struct exportinfo **expp, struct svc_req *rp, - struct AFS_UCRED *crp) + AFS_UCRED *crp) { afs_int32 call = 0; afs_int32 code = 0; @@ -1138,8 +1138,8 @@ afs_nfs3_getattr(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_GETATTR, (char *)args, &exp, rp, crp); if (call > 1) @@ -1156,8 +1156,8 @@ afs_nfs3_setattr(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_SETATTR, (char *)args, &exp, rp, crp); if (call > 1) @@ -1174,8 +1174,8 @@ afs_nfs3_lookup(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_LOOKUP, (char *)args, &exp, rp, crp); if (call > 1) @@ -1197,8 +1197,8 @@ afs_nfs3_access(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_ACCESS, (char *)args, &exp, rp, crp); if (call > 1) @@ -1215,8 +1215,8 @@ afs_nfs3_readlink(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_READLINK, (char *)args, &exp, rp, crp); @@ -1234,8 +1234,8 @@ afs_nfs3_read(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_READ, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); @@ -1251,8 +1251,8 @@ afs_nfs3_write(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_WRITE, (char *)args, &exp, rp, crp); if (call > 1) @@ -1269,8 +1269,8 @@ afs_nfs3_create(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_CREATE, (char *)args, &exp, rp, crp); if (call > 1) @@ -1292,8 +1292,8 @@ afs_nfs3_mkdir(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_MKDIR, (char *)args, &exp, rp, crp); if (call > 1) @@ -1315,8 +1315,8 @@ afs_nfs3_symlink(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_SYMLINK, (char *)args, &exp, rp, crp); if (call > 1) @@ -1338,8 +1338,8 @@ afs_nfs3_mknod(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_MKNOD, (char *)args, &exp, rp, crp); if (call > 1) @@ -1361,8 +1361,8 @@ afs_nfs3_remove(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_REMOVE, (char *)args, &exp, rp, crp); if (call > 1) @@ -1379,8 +1379,8 @@ afs_nfs3_rmdir(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_RMDIR, (char *)args, &exp, rp, crp); if (call > 1) @@ -1397,8 +1397,8 @@ afs_nfs3_rename(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_RENAME, (char *)args, &exp, rp, crp); if (call > 1) @@ -1415,8 +1415,8 @@ afs_nfs3_link(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_LINK, (char *)args, &exp, rp, crp); if (call > 1) afs_nfs3_noaccess((struct afs_nfs3_resp *)xp); @@ -1432,8 +1432,8 @@ afs_nfs3_readdir(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_READDIR, (char *)args, &exp, rp, crp); if (call > 1) @@ -1450,8 +1450,8 @@ afs_nfs3_readdirplus(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_READDIRPLUS, (char *)args, &exp, rp, crp); @@ -1471,8 +1471,8 @@ afs_nfs3_fsstat(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_FSSTAT, (char *)args, &exp, rp, crp); if (call > 1) @@ -1489,8 +1489,8 @@ afs_nfs3_fsinfo(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_FSINFO, (char *)args, &exp, rp, crp); if (call > 1) @@ -1507,8 +1507,8 @@ afs_nfs3_pathconf(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_PATHCONF, (char *)args, &exp, rp, crp); @@ -1526,8 +1526,8 @@ afs_nfs3_commit(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; afs_nfs3_resp dummy; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(0, NFSPROC3_COMMIT, (char *)args, &exp, rp, crp); if (call > 1) @@ -1568,8 +1568,8 @@ void afs_acl3_getacl(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(1, ACLPROC3_GETACL, (char *)args, &exp, rp, crp); if (call > 1) @@ -1585,8 +1585,8 @@ void afs_acl3_setacl(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(1, ACLPROC3_SETACL, (char *)args, &exp, rp, crp); if (call > 1) @@ -1603,8 +1603,8 @@ void afs_acl3_getxattrdir(char *args, char *xp, char *exp, char *rp, char *crp) { u_int call; - struct AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (struct AFS_UCRED *)crp; + AFS_UCRED *svcred = curthread->t_cred; + curthread->t_cred = (AFS_UCRED *)crp; call = afs_nfs3_dispatcher(1, ACLPROC3_GETXATTRDIR, (char *)args, &exp, rp, crp); if (call > 1) diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c index 490f970b8..9c4caf9e0 100644 --- a/src/afs/afs_osi.c +++ b/src/afs/afs_osi.c @@ -34,7 +34,7 @@ lock_t afs_event_lock; flid_t osi_flid; #endif -struct AFS_UCRED *afs_osi_credp; +AFS_UCRED *afs_osi_credp; #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) kmutex_t afs_global_lock; @@ -120,7 +120,7 @@ osi_Init(void) /* Can't just invent one, must use crget() because of mutex */ afs_osi_credp = crdup(osi_curcred()); #else - memset(&afs_osi_cred, 0, sizeof(struct AFS_UCRED)); + memset(&afs_osi_cred, 0, sizeof(AFS_UCRED)); #if defined(AFS_LINUX26_ENV) afs_osi_cred.cr_group_info = groups_alloc(0); #endif diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h index de0462c0c..1dab4451b 100644 --- a/src/afs/afs_osi.h +++ b/src/afs/afs_osi.h @@ -441,7 +441,7 @@ typedef struct timeval osi_timeval_t; /* Declare any structures which use these macros after the OSI implementation * has had the opportunity to redefine them. */ -extern struct AFS_UCRED afs_osi_cred, *afs_osi_credp; +extern AFS_UCRED afs_osi_cred, *afs_osi_credp; #ifndef osi_curcred #define osi_curcred() (u.u_cred) diff --git a/src/afs/afs_osi_gcpags.c b/src/afs/afs_osi_gcpags.c index 65500601d..f7ec4d81e 100644 --- a/src/afs/afs_osi_gcpags.c +++ b/src/afs/afs_osi_gcpags.c @@ -287,13 +287,13 @@ afs_osi_TraverseProcTable() */ #if defined(AFS_SGI65_ENV) -const struct AFS_UCRED * +const AFS_UCRED * afs_osi_proc2cred(AFS_PROC * p) { return NULL; } #elif defined(AFS_HPUX_ENV) -const struct AFS_UCRED * +const AFS_UCRED * afs_osi_proc2cred(AFS_PROC * p) { if (!p) @@ -318,10 +318,10 @@ afs_osi_proc2cred(AFS_PROC * p) * around calls to this function. */ -const struct AFS_UCRED * +const AFS_UCRED * afs_osi_proc2cred(AFS_PROC * pproc) { - struct AFS_UCRED *pcred = 0; + AFS_UCRED *pcred = 0; /* * pointer to process user structure valid in *our* @@ -416,7 +416,7 @@ afs_osi_proc2cred(AFS_PROC * pproc) /* simple_unlock(&proc_tbl_lock); */ if (xm == XMEM_SUCC) { - static struct AFS_UCRED cred; + static AFS_UCRED cred; /* * What locking should we use to protect access to the user @@ -437,10 +437,10 @@ afs_osi_proc2cred(AFS_PROC * pproc) } #elif defined(AFS_OSF_ENV) -const struct AFS_UCRED * +const AFS_UCRED * afs_osi_proc2cred(AFS_PROC * pr) { - struct AFS_UCRED *rv = NULL; + AFS_UCRED *rv = NULL; if (pr == NULL) { return NULL; @@ -453,11 +453,11 @@ afs_osi_proc2cred(AFS_PROC * pr) return rv; } #elif defined(AFS_DARWIN80_ENV) -const struct AFS_UCRED * +const AFS_UCRED * afs_osi_proc2cred(AFS_PROC * pr) { - struct AFS_UCRED *rv = NULL; - static struct AFS_UCRED cr; + AFS_UCRED *rv = NULL; + static AFS_UCRED cr; struct ucred *pcred; if (pr == NULL) { @@ -472,11 +472,11 @@ afs_osi_proc2cred(AFS_PROC * pr) return &cr; } #elif defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) -const struct AFS_UCRED * +const AFS_UCRED * afs_osi_proc2cred(AFS_PROC * pr) { - struct AFS_UCRED *rv = NULL; - static struct AFS_UCRED cr; + AFS_UCRED *rv = NULL; + static AFS_UCRED cr; if (pr == NULL) { return NULL; @@ -498,11 +498,11 @@ afs_osi_proc2cred(AFS_PROC * pr) } #elif defined(AFS_LINUX22_ENV) #if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK)) -const struct AFS_UCRED * +const AFS_UCRED * afs_osi_proc2cred(AFS_PROC * pr) { - struct AFS_UCRED *rv = NULL; - static struct AFS_UCRED cr; + AFS_UCRED *rv = NULL; + static AFS_UCRED cr; if (pr == NULL) { return NULL; @@ -532,10 +532,10 @@ afs_osi_proc2cred(AFS_PROC * pr) } #endif #else -const struct AFS_UCRED * +const AFS_UCRED * afs_osi_proc2cred(AFS_PROC * pr) { - struct AFS_UCRED *rv = NULL; + AFS_UCRED *rv = NULL; if (pr == NULL) { return NULL; diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c index cfb8b282d..212843ab4 100644 --- a/src/afs/afs_osi_pag.c +++ b/src/afs/afs_osi_pag.c @@ -146,7 +146,7 @@ static int afs_pag_sleepcnt = 0; static int afs_pag_timewarn = 0; static int -afs_pag_sleep(struct AFS_UCRED **acred) +afs_pag_sleep(AFS_UCRED **acred) { int rv = 0; @@ -167,7 +167,7 @@ afs_pag_sleep(struct AFS_UCRED **acred) } static int -afs_pag_wait(struct AFS_UCRED **acred) +afs_pag_wait(AFS_UCRED **acred) { if (afs_pag_sleep(acred)) { if (!afs_pag_sleepcnt) { @@ -190,7 +190,7 @@ afs_pag_wait(struct AFS_UCRED **acred) int #if defined(AFS_SUN5_ENV) -afs_setpag(struct AFS_UCRED **credpp) +afs_setpag(AFS_UCRED **credpp) #elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) afs_setpag(struct proc *p, void *args, int *retval) #else @@ -199,11 +199,11 @@ afs_setpag(void) { #if defined(AFS_SUN5_ENV) - struct AFS_UCRED **acred = *credpp; + AFS_UCRED **acred = *credpp; #elif defined(AFS_OBSD_ENV) - struct AFS_UCRED **acred = &p->p_ucred; + AFS_UCRED **acred = &p->p_ucred; #else - struct AFS_UCRED **acred = NULL; + AFS_UCRED **acred = NULL; #endif int code = 0; @@ -248,19 +248,19 @@ afs_setpag(void) } #elif defined(AFS_LINUX20_ENV) { - struct AFS_UCRED *credp = crref(); + AFS_UCRED *credp = crref(); code = AddPag(genpag(), &credp); crfree(credp); } #elif defined(AFS_DARWIN80_ENV) { - struct AFS_UCRED *credp = kauth_cred_proc_ref(p); + AFS_UCRED *credp = kauth_cred_proc_ref(p); code = AddPag(p, genpag(), &credp); crfree(credp); } #elif defined(AFS_DARWIN_ENV) { - struct AFS_UCRED *credp = crdup(p->p_cred->pc_ucred); + AFS_UCRED *credp = crdup(p->p_cred->pc_ucred); code = AddPag(p, genpag(), &credp); crfree(credp); } @@ -292,7 +292,7 @@ afs_setpag(void) */ int #if defined(AFS_SUN5_ENV) -afs_setpag_val(struct AFS_UCRED **credpp, int pagval) +afs_setpag_val(AFS_UCRED **credpp, int pagval) #elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) afs_setpag_val(struct proc *p, void *args, int *retval, int pagval) #else @@ -301,11 +301,11 @@ afs_setpag_val(int pagval) { #if defined(AFS_SUN5_ENV) - struct AFS_UCRED **acred = *credp; + AFS_UCRED **acred = *credp; #elif defined(AFS_OBSD_ENV) - struct AFS_UCRED **acred = &p->p_ucred; + AFS_UCRED **acred = &p->p_ucred; #else - struct AFS_UCRED **acred = NULL; + AFS_UCRED **acred = NULL; #endif int code = 0; @@ -349,7 +349,7 @@ afs_setpag_val(int pagval) } #elif defined(AFS_LINUX20_ENV) { - struct AFS_UCRED *credp = crref(); + AFS_UCRED *credp = crref(); code = AddPag(pagval, &credp); crfree(credp); } @@ -379,7 +379,7 @@ int afs_getpag_val(void) { int pagvalue; - struct AFS_UCRED *credp = u.u_cred; + AFS_UCRED *credp = u.u_cred; gid_t gidset0, gidset1; #ifdef AFS_SUN510_ENV const gid_t *gids; @@ -401,10 +401,10 @@ afs_getpag_val(void) /* Note - needs to be available on AIX, others can be static - rework this */ #if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) int -AddPag(struct proc *p, afs_int32 aval, struct AFS_UCRED **credpp) +AddPag(struct proc *p, afs_int32 aval, AFS_UCRED **credpp) #else int -AddPag(afs_int32 aval, struct AFS_UCRED **credpp) +AddPag(afs_int32 aval, AFS_UCRED **credpp) #endif { afs_int32 code; @@ -426,7 +426,7 @@ AddPag(afs_int32 aval, struct AFS_UCRED **credpp) int -afs_InitReq(register struct vrequest *av, struct AFS_UCRED *acred) +afs_InitReq(register struct vrequest *av, AFS_UCRED *acred) { #if defined(AFS_LINUX26_ENV) && !defined(AFS_NONFSTRANS) int code; @@ -545,7 +545,7 @@ afs_get_groups_from_pag(afs_uint32 pag, gid_t * g0p, gid_t * g1p) afs_int32 -PagInCred(struct AFS_UCRED *cred) +PagInCred(AFS_UCRED *cred) { afs_int32 pag; #if !defined(AFS_LINUX26_ONEGROUP_ENV) diff --git a/src/afs/afs_osi_vm.c b/src/afs/afs_osi_vm.c index f1eb50eea..59d9db054 100644 --- a/src/afs/afs_osi_vm.c +++ b/src/afs/afs_osi_vm.c @@ -45,7 +45,7 @@ osi_Active(register struct vcache *avc) us, of course). */ void -osi_FlushPages(register struct vcache *avc, struct AFS_UCRED *credp) +osi_FlushPages(register struct vcache *avc, AFS_UCRED *credp) { #ifdef AFS_FBSD70_ENV int vfslocked; @@ -261,7 +261,7 @@ osi_VMDirty_p(struct vcache *avc) * Locking: the vcache entry lock is held. It is dropped and re-obtained. */ void -osi_ReleaseVM(struct vcache *avc, struct AFS_UCRED *acred) +osi_ReleaseVM(struct vcache *avc, AFS_UCRED *acred) { #ifdef AFS_SUN5_ENV AFS_GUNLOCK(); diff --git a/src/afs/afs_pag_call.c b/src/afs/afs_pag_call.c index 55ccdb7c0..2fc124e37 100644 --- a/src/afs/afs_pag_call.c +++ b/src/afs/afs_pag_call.c @@ -363,11 +363,11 @@ int #ifdef AFS_SUN5_ENV afs_syscall_pioctl(path, com, cmarg, follow, rvp, credp) rval_t *rvp; - struct AFS_UCRED *credp; + AFS_UCRED *credp; #else #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) afs_syscall_pioctl(path, com, cmarg, follow, credp) - struct AFS_UCRED *credp; + AFS_UCRED *credp; #else afs_syscall_pioctl(path, com, cmarg, follow) #endif diff --git a/src/afs/afs_pag_cred.c b/src/afs/afs_pag_cred.c index 1ecad50a2..6f61bfee4 100644 --- a/src/afs/afs_pag_cred.c +++ b/src/afs/afs_pag_cred.c @@ -88,7 +88,7 @@ void afspag_SetPrimaryCell(char *acell) } -int afspag_PUnlog(char *ain, afs_int32 ainSize, struct AFS_UCRED **acred) +int afspag_PUnlog(char *ain, afs_int32 ainSize, AFS_UCRED **acred) { register afs_int32 i; register struct unixuser *tu; @@ -122,7 +122,7 @@ int afspag_PUnlog(char *ain, afs_int32 ainSize, struct AFS_UCRED **acred) } -int afspag_PSetTokens(char *ain, afs_int32 ainSize, struct AFS_UCRED **acred) +int afspag_PSetTokens(char *ain, afs_int32 ainSize, AFS_UCRED **acred) { afs_int32 i; register struct unixuser *tu; @@ -313,7 +313,7 @@ out: } -int afspag_PSetSysName(char *ain, afs_int32 ainSize, struct AFS_UCRED **acred) +int afspag_PSetSysName(char *ain, afs_int32 ainSize, AFS_UCRED **acred) { int setsysname, count, t; char *cp, *setp; diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index 2914ce731..abe0ac076 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -55,7 +55,7 @@ afs_int32 afs_in_sync = 0; #define DECL_PIOCTL(x) static int x(struct vcache *avc, int afun, struct vrequest *areq, \ char *ain, char *aout, afs_int32 ainSize, afs_int32 *aoutSize, \ - struct AFS_UCRED **acred) + AFS_UCRED **acred) /* Prototypes for pioctl routines */ DECL_PIOCTL(PGetFID); @@ -134,20 +134,20 @@ DECL_PIOCTL(PSetCachingBlkSize); /* Prototypes for private routines */ #ifdef AFS_NEED_CLIENTCONTEXT static int HandleClientContext(struct afs_ioctl *ablob, int *com, - struct AFS_UCRED **acred, - struct AFS_UCRED *credp); + AFS_UCRED **acred, + AFS_UCRED *credp); #endif int HandleIoctl(register struct vcache *avc, register afs_int32 acom, struct afs_ioctl *adata); int afs_HandlePioctl(struct vnode *avp, afs_int32 acom, register struct afs_ioctl *ablob, int afollow, - struct AFS_UCRED **acred); + AFS_UCRED **acred); static int Prefetch(iparmtype apath, struct afs_ioctl *adata, int afollow, - struct AFS_UCRED *acred); + AFS_UCRED *acred); typedef int (*pioctlFunction) (struct vcache *, int, struct vrequest *, char *, char *, afs_int32, afs_int32 *, - struct AFS_UCRED **); + AFS_UCRED **); static pioctlFunction VpioctlSw[] = { PBogus, /* 0 */ @@ -776,14 +776,14 @@ afs_pioctl(struct proc *p, void *args, int *retval) int #ifdef AFS_SUN5_ENV afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow, - rval_t *vvp, struct AFS_UCRED *credp) + rval_t *vvp, AFS_UCRED *credp) #else #ifdef AFS_DARWIN100_ENV afs_syscall64_pioctl(user_addr_t path, unsigned int com, user_addr_t cmarg, - int follow, struct AFS_UCRED *credp) + int follow, AFS_UCRED *credp) #elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow, - struct AFS_UCRED *credp) + AFS_UCRED *credp) #else afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) #endif @@ -791,10 +791,10 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) { struct afs_ioctl data; #ifdef AFS_NEED_CLIENTCONTEXT - struct AFS_UCRED *tmpcred = NULL; + AFS_UCRED *tmpcred = NULL; #endif #if defined(AFS_NEED_CLIENTCONTEXT) || defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_LINUX22_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) - struct AFS_UCRED *foreigncreds = NULL; + AFS_UCRED *foreigncreds = NULL; #endif register afs_int32 code = 0; struct vnode *vp = NULL; @@ -1009,7 +1009,7 @@ afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow) #ifdef AFS_DARWIN100_ENV int afs_syscall_pioctl(char * path, unsigned int com, caddr_t cmarg, - int follow, struct AFS_UCRED *credp) + int follow, AFS_UCRED *credp) { return afs_syscall64_pioctl(CAST_USER_ADDR_T(path), com, CAST_USER_ADDR_T((unsigned int)cmarg), follow, @@ -1023,7 +1023,7 @@ afs_syscall_pioctl(char * path, unsigned int com, caddr_t cmarg, int afs_HandlePioctl(struct vnode *avp, afs_int32 acom, register struct afs_ioctl *ablob, int afollow, - struct AFS_UCRED **acred) + AFS_UCRED **acred) { struct vcache *avc; struct vrequest treq; @@ -2290,7 +2290,7 @@ DECL_PIOCTL(PCheckAuth) static int Prefetch(iparmtype apath, struct afs_ioctl *adata, int afollow, - struct AFS_UCRED *acred) + AFS_UCRED *acred) { register char *tp; register afs_int32 code; @@ -3970,13 +3970,13 @@ DECL_PIOCTL(PSetRxkcrypt) #define PIOCTL_HEADER 6 static int HandleClientContext(struct afs_ioctl *ablob, int *com, - struct AFS_UCRED **acred, struct AFS_UCRED *credp) + AFS_UCRED **acred, struct AFS_UCRED *credp) { char *ain, *inData; afs_uint32 hostaddr; afs_int32 uid, g0, g1, i, code, pag, exporter_type, isroot = 0; struct afs_exporter *exporter, *outexporter; - struct AFS_UCRED *newcred; + AFS_UCRED *newcred; struct unixuser *au; afs_uint32 comp = *com & 0xff00; afs_uint32 h, l; diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h index a6ff4dd3d..fad0b4749 100644 --- 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 diff --git a/src/afs/afs_segments.c b/src/afs/afs_segments.c index d124a86ac..7411b070c 100644 --- a/src/afs/afs_segments.c +++ b/src/afs/afs_segments.c @@ -502,7 +502,7 @@ afs_InvalidateAllSegments(struct vcache *avc) /* Blow away pages; for now, only for Solaris */ #if (defined(AFS_SUN5_ENV)) if (WriteLocked(&avc->lock)) - osi_ReleaseVM(avc, (struct AFS_UCRED *)0); + osi_ReleaseVM(avc, (AFS_UCRED *)0); #endif /* * Block out others from screwing with this table; is a read lock @@ -641,7 +641,7 @@ afs_ExtendSegments(struct vcache *avc, afs_size_t alen, struct vrequest *areq) { */ int afs_TruncateAllSegments(register struct vcache *avc, afs_size_t alen, - struct vrequest *areq, struct AFS_UCRED *acred) + struct vrequest *areq, AFS_UCRED *acred) { register struct dcache *tdc; register afs_int32 code; diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c index 3beaf48cb..b24525b1c 100644 --- a/src/afs/afs_user.c +++ b/src/afs/afs_user.c @@ -596,7 +596,7 @@ void afs_GCPAGs_perproc_func(AFS_PROC * pproc) { afs_int32 pag, hash, uid; - const struct AFS_UCRED *pcred; + const AFS_UCRED *pcred; afs_GCPAGs_perproc_count++; diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index f94472e40..a03e42d85 100644 --- a/src/afs/afs_vcache.c +++ b/src/afs/afs_vcache.c @@ -294,7 +294,7 @@ afs_FlushVCache(struct vcache *avc, int *slept) * \param acred */ void -afs_InactiveVCache(struct vcache *avc, struct AFS_UCRED *acred) +afs_InactiveVCache(struct vcache *avc, AFS_UCRED *acred) { AFS_STATCNT(afs_inactive); if (avc->f.states & CDirty) { @@ -1264,7 +1264,7 @@ afs_FlushActiveVcaches(register afs_int32 doflocks) register int i; register struct afs_conn *tc; register afs_int32 code; - struct AFS_UCRED *cred = NULL; + AFS_UCRED *cred = NULL; struct vrequest treq, ureq; struct AFSVolSync tsync; int didCore; @@ -1336,7 +1336,7 @@ afs_FlushActiveVcaches(register afs_int32 doflocks) if (tvc->f.states & CCore) { tvc->f.states &= ~CCore; /* XXXX Find better place-holder for cred XXXX */ - cred = (struct AFS_UCRED *)tvc->linkData; + cred = (AFS_UCRED *)tvc->linkData; tvc->linkData = NULL; /* XXX */ afs_InitReq(&ureq, cred); afs_Trace2(afs_iclSetp, CM_TRACE_ACTCCORE, @@ -2865,7 +2865,7 @@ afs_PutVCache(register struct vcache *avc) * \note avc must be write locked on entry */ void -afs_ResetVCache(struct vcache *avc, struct AFS_UCRED *acred) { +afs_ResetVCache(struct vcache *avc, AFS_UCRED *acred) { ObtainWriteLock(&afs_xcbhash, 456); afs_DequeueCallback(avc); avc->f.states &= ~(CStatd | CDirty); /* next reference will re-stat */ diff --git a/src/afs/afsincludes.h b/src/afs/afsincludes.h index 898b1d03d..4cd68b623 100644 --- a/src/afs/afsincludes.h +++ b/src/afs/afsincludes.h @@ -7,6 +7,10 @@ * directory or online at http://www.openafs.org/dl/license10.html */ +#ifndef AFS_INCLUDES_H +#define AFS_INCLUDES_H 1 + + #ifdef UKERNEL #include #else @@ -57,3 +61,5 @@ #endif #endif + +#endif /* AFS_INCLUDES_H */ diff --git a/src/afs/discon.h b/src/afs/discon.h index 869fb90ca..ac3d91761 100644 --- a/src/afs/discon.h +++ b/src/afs/discon.h @@ -32,7 +32,7 @@ extern int afs_WriteVCacheDiscon(register struct vcache *avc, register struct AFSStoreStatus *astatus, struct vattr *attrs); extern int afs_ResyncDisconFiles(struct vrequest *areq, - struct AFS_UCRED *acred); + AFS_UCRED *acred); extern void afs_RemoveAllConns(void); extern void afs_GenFakeFid(struct VenusFid *afid, afs_uint32 avtype, int lock); @@ -52,7 +52,7 @@ extern void afs_UpdateStatus(struct vcache *avc, struct AFSFetchStatus *Outsp, struct AFSCallBack *acb, afs_uint32 start); -extern void afs_DisconDiscardAll(struct AFS_UCRED *); +extern void afs_DisconDiscardAll(AFS_UCRED *); #define AFS_IS_DISCONNECTED (afs_is_disconnected) #define AFS_IS_DISCON_RW (afs_is_discon_rw) diff --git a/src/afs/exporter.h b/src/afs/exporter.h index 4b4aef94f..a7d1ac79e 100644 --- a/src/afs/exporter.h +++ b/src/afs/exporter.h @@ -54,7 +54,7 @@ struct afs_exporter; struct exporterops { int (*export_reqhandler) (struct afs_exporter *exp, - struct AFS_UCRED **cred, + AFS_UCRED **cred, afs_uint32 host, afs_int32 pag, struct afs_exporter **expp); -- 2.39.5