From: matt@linuxbox.com Date: Mon, 12 Oct 2009 00:52:26 +0000 (-0400) Subject: Make typedefs of AFS_UCRED and AFS_PROC with renaming X-Git-Tag: openafs-devel-1_5_66~21 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=5d5d18071608d9782a5d936f79215048af641410 Make typedefs of AFS_UCRED and AFS_PROC with renaming Make typedefs of AFS_UCRED and AFS_PROC, with a corresponding name change. The names afs_ucred_t and afs_proc_t are chosen since these appear to be the best available choices. The names cannot actually collide with anything which POSIX might later introduce. For UKERNEL, the preprocessor is used to redirect references. This seems not easily avoidable at present. LICENSE BSD Reviewed-on: http://gerrit.openafs.org/645 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/src/afs/AIX/osi_file.c b/src/afs/AIX/osi_file.c index 2580491..afc09bc 100644 --- a/src/afs/AIX/osi_file.c +++ b/src/afs/AIX/osi_file.c @@ -17,7 +17,7 @@ int afs_osicred_initialized = 0; -AFS_UCRED afs_osi_cred; +afs_ucred_t 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(AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(afs_ucred_t)); 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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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 f1d63ad..ffab0ae 100644 --- a/src/afs/AIX/osi_machdep.h +++ b/src/afs/AIX/osi_machdep.h @@ -26,8 +26,8 @@ extern long time; #define osi_Time() (time) -#define AFS_UCRED struct ucred -#define AFS_PROC struct proc +typedef struct ucred afs_ucred_t; +typedef struct proc afs_proc_t; #define afs_bufferpages v.v_bufhw diff --git a/src/afs/AIX/osi_vm.c b/src/afs/AIX/osi_vm.c index 05c8320..b7e2338 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, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync) { if (avc->segid) { ReleaseWriteLock(&avc->lock); @@ -137,7 +137,7 @@ osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { if (avc->segid) { vm_flushp(avc->segid, 0, MAXFSIZE / PAGESIZE - 1); @@ -155,7 +155,7 @@ osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *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 5118e11..0e40001 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, - AFS_UCRED *acred) + afs_ucred_t *acred) { afs_InactiveVCache(avc, acred); } diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c index e78abb0..c40d2fe 100644 --- a/src/afs/DARWIN/osi_file.c +++ b/src/afs/DARWIN/osi_file.c @@ -18,7 +18,7 @@ int afs_osicred_initialized = 0; -AFS_UCRED afs_osi_cred; +afs_ucred_t 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(AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(afs_ucred_t)); 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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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 5e07aa3..a82d388 100644 --- a/src/afs/DARWIN/osi_machdep.h +++ b/src/afs/DARWIN/osi_machdep.h @@ -138,9 +138,8 @@ static inline time_t osi_Time(void) { extern int hz; #endif -#define AFS_UCRED struct ucred - -#define AFS_PROC struct proc +typedef struct ucred afs_ucred_t; +typedef struct proc afs_proc_t; #define osi_vnhold(avc,r) VN_HOLD(AFSTOV(avc)) #define VN_HOLD(vp) darwin_vn_hold(vp) diff --git a/src/afs/DARWIN/osi_vm.c b/src/afs/DARWIN/osi_vm.c index f0e7c04..805cb38 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, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync) { struct vnode *vp = AFSTOV(avc); void *object; @@ -118,7 +118,7 @@ osi_VM_TryToSmush(struct vcache *avc, 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, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { struct vnode *vp = AFSTOV(avc); void *object; @@ -151,7 +151,7 @@ osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *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 0afddc1..5ffb1a8 100644 --- a/src/afs/FBSD/osi_file.c +++ b/src/afs/FBSD/osi_file.c @@ -17,7 +17,7 @@ int afs_osicred_initialized = 0; -AFS_UCRED afs_osi_cred; +afs_ucred_t 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 8f882e9..0d7f81c 100644 --- a/src/afs/FBSD/osi_machdep.h +++ b/src/afs/FBSD/osi_machdep.h @@ -31,8 +31,8 @@ #define osi_Time() time_second #define afs_hz hz -#define AFS_UCRED struct ucred -#define AFS_PROC struct proc +typedef struct ucred afs_ucred_t; +typedef struct proc afs_proc_t; #define afs_bufferpages bufpages #ifndef iodone diff --git a/src/afs/FBSD/osi_vm.c b/src/afs/FBSD/osi_vm.c index 7e30f50..a052222 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, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync) { struct vnode *vp; struct vm_object *obj; @@ -248,7 +248,7 @@ osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { struct vnode *vp; struct vm_object *obj; @@ -270,7 +270,7 @@ osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *acred) { vnode_pager_setsize(AFSTOV(avc), alen); } diff --git a/src/afs/HPUX/osi_file.c b/src/afs/HPUX/osi_file.c index 2f78898..fba2125 100644 --- a/src/afs/HPUX/osi_file.c +++ b/src/afs/HPUX/osi_file.c @@ -18,7 +18,7 @@ int afs_osicred_initialized = 0; -AFS_UCRED afs_osi_cred; +afs_ucred_t 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(AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(afs_ucred_t)); 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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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 89a5563..057b309 100644 --- a/src/afs/HPUX/osi_machdep.h +++ b/src/afs/HPUX/osi_machdep.h @@ -25,8 +25,8 @@ extern struct timeval time; #define osi_Time() (time.tv_sec) -#define AFS_UCRED struct ucred -#define AFS_PROC proc_t +typedef struct ucred afs_ucred_t; +typedef proc_t afs_proc_t; #define osi_vnhold(avc, r) do { VN_HOLD(AFSTOV(avc)); } while(0) #define gop_rdwr(rw,gp,base,len,offset,segflg,unit,aresid) \ diff --git a/src/afs/HPUX/osi_vm.c b/src/afs/HPUX/osi_vm.c index c21db3d..0e169bd 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, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync) { struct vnode *vp = AFSTOV(avc); @@ -81,7 +81,7 @@ osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { ; /* Nothing here yet */ } @@ -93,7 +93,7 @@ osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *acred) { ; /* Nothing here yet */ } diff --git a/src/afs/HPUX/osi_vnodeops.c b/src/afs/HPUX/osi_vnodeops.c index 2c118a3..d94c7ff 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; - AFS_UCRED *cred; + afs_ucred_t *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; - AFS_UCRED *acred; + afs_ucred_t *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, AFS_UCRED *acred) +mp_afs_open(register struct vnode **avcp, int aflags, afs_ucred_t *acred) { register int code; @@ -331,7 +331,7 @@ mp_afs_open(register struct vnode **avcp, int aflags, AFS_UCRED *acred) } int -mp_afs_close(register struct vnode *avcp, int aflags, AFS_UCRED *acred) +mp_afs_close(register struct vnode *avcp, int aflags, afs_ucred_t *acred) { register int code; @@ -343,7 +343,7 @@ mp_afs_close(register struct vnode *avcp, int aflags, AFS_UCRED *acred) int mp_afs_rdwr(register struct vnode *avcp, struct uio *uio, enum uio_rw arw, - int aio, AFS_UCRED *acred) + int aio, afs_ucred_t *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, - AFS_UCRED *acred, enum vsync unused1) + afs_ucred_t *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, - AFS_UCRED *acred, int unused1) + afs_ucred_t *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, AFS_UCRED *acred) +mp_afs_access(register struct vnode *avcp, int mode, afs_ucred_t *acred) { register int code; @@ -396,7 +396,7 @@ mp_afs_access(register struct vnode *avcp, int mode, AFS_UCRED *acred) int mp_afs_lookup(register struct vnode *adp, char *aname, - register struct vnode **avcp, AFS_UCRED *acred, + register struct vnode **avcp, afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *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, AFS_UCRED *acred) + char *aname, afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *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, AFS_UCRED *acred) + register struct vnode **avcp, afs_ucred_t *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, AFS_UCRED *acred) +mp_afs_rmdir(register struct vnode *adp, char *aname, afs_ucred_t *acred) { register int code; @@ -485,7 +485,7 @@ mp_afs_rmdir(register struct vnode *adp, char *aname, AFS_UCRED *acred) int mp_afs_readdir(register struct vnode *avc, struct uio *auio, - AFS_UCRED *acred) + afs_ucred_t *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, AFS_UCRED *acred) + char *atargetName, afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *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, AFS_UCRED *acred, int unused1) +mp_afs_fsync(register struct vnode *avc, afs_ucred_t *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, AFS_UCRED *acred) +mp_afs_inactive(register struct vnode *avc, afs_ucred_t *acred) { register int code; @@ -568,7 +568,7 @@ mp_afs_inactive(register struct vnode *avc, AFS_UCRED *acred) int mp_afs_lockctl(struct vnode *avc, struct flock *af, int cmd, - AFS_UCRED *acred, struct file *unused1, off_t unused2, + afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *acred) { register int code; diff --git a/src/afs/IRIX/osi_file.c b/src/afs/IRIX/osi_file.c index 2b7615e..9756df8 100644 --- a/src/afs/IRIX/osi_file.c +++ b/src/afs/IRIX/osi_file.c @@ -15,7 +15,7 @@ #include "afsincludes.h" /* Afs-based standard headers */ #include "afs/afs_stats.h" /* afs statistics */ -AFS_UCRED afs_osi_cred; +afs_ucred_t afs_osi_cred; int afs_osicred_initialized = 0; afs_lock_t afs_xosi; /* lock is for tvattr */ extern struct osi_dev cacheDev; @@ -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(AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(afs_ucred_t)); 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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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 7e5ce60..444c24c 100644 --- a/src/afs/IRIX/osi_machdep.h +++ b/src/afs/IRIX/osi_machdep.h @@ -27,9 +27,8 @@ 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 struct cred - -#define AFS_PROC struct proc +typedef struct cred afs_ucred_t; +typedef struct proc afs_proc_t; #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 7761574..50a61ae 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, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *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, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { vnode_t *vp = (vnode_t *) avc; @@ -241,7 +241,7 @@ osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *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 52dbdca..1487091 100644 --- a/src/afs/LINUX/osi_file.c +++ b/src/afs/LINUX/osi_file.c @@ -78,7 +78,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(AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(afs_ucred_t)); 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 7baa995..21f992e 100644 --- a/src/afs/LINUX/osi_machdep.h +++ b/src/afs/LINUX/osi_machdep.h @@ -167,8 +167,10 @@ typedef struct afs_cred { /* maps to task field: */ struct group_info *cr_group_info; struct afs_cred *cr_next; } cred_t; -#define AFS_UCRED struct afs_cred -#define AFS_PROC struct task_struct + +typedef struct afs_cred afs_ucred_t; +typedef struct task_struct afs_proc_t; + #if !defined(current_cred) #define current_gid() (current->gid) #define current_uid() (current->uid) diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c index 18ed7eb..e2af595 100644 --- a/src/afs/LINUX/osi_misc.c +++ b/src/afs/LINUX/osi_misc.c @@ -25,7 +25,7 @@ #include int afs_osicred_initialized = 0; -AFS_UCRED afs_osi_cred; +afs_ucred_t 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 24a4b36..7c61403 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; - AFS_UCRED *credp; + afs_ucred_t *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, AFS_UCRED *cr, int *code) +int osi_linux_nfs_initreq(struct vrequest *av, afs_ucred_t *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 bb0eb57..d390b87 100644 --- a/src/afs/LINUX/osi_pag_module.c +++ b/src/afs/LINUX/osi_pag_module.c @@ -115,7 +115,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, AFS_UCRED *cr, int *code) +int osi_linux_nfs_initreq(struct vrequest *av, afs_ucred_t *cr, int *code) { *code = EACCES; return 1; @@ -123,7 +123,7 @@ int osi_linux_nfs_initreq(struct vrequest *av, AFS_UCRED *cr, int *code) int afs_nfsclient_reqhandler(struct afs_exporter *exporter, - AFS_UCRED **cred, + afs_ucred_t **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 9bc8bca..a9b9b89 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, AFS_UCRED *cr, +extern int osi_linux_nfs_initreq(struct vrequest *av, afs_ucred_t *cr, int *code); extern void osi_linux_nfssrv_init(void); extern void osi_linux_nfssrv_shutdown(void); @@ -71,13 +71,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, AFS_UCRED *acred, +extern void osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *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, AFS_UCRED *credp); +extern void osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp); extern void osi_VM_Truncate(struct vcache *avc, int alen, - AFS_UCRED *acred); + afs_ucred_t *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 93b3548..c33eaed 100644 --- a/src/afs/LINUX/osi_vm.c +++ b/src/afs/LINUX/osi_vm.c @@ -63,7 +63,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, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync) { struct inode *ip = AFSTOV(avc); @@ -112,7 +112,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * then these callers should be updated. */ void -osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { struct inode *ip = AFSTOV(avc); @@ -126,7 +126,7 @@ osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *acred) { vmtruncate(AFSTOV(avc), alen); } diff --git a/src/afs/LINUX24/osi_file.c b/src/afs/LINUX24/osi_file.c index c2c7cc7..3bd1768 100644 --- a/src/afs/LINUX24/osi_file.c +++ b/src/afs/LINUX24/osi_file.c @@ -85,7 +85,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(AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(afs_ucred_t)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; } @@ -119,7 +119,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(AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(afs_ucred_t)); crhold(&afs_osi_cred); /* don't let it evaporate, since it is static */ afs_osicred_initialized = 1; } diff --git a/src/afs/LINUX24/osi_machdep.h b/src/afs/LINUX24/osi_machdep.h index 02e0898..19e8010 100644 --- a/src/afs/LINUX24/osi_machdep.h +++ b/src/afs/LINUX24/osi_machdep.h @@ -165,8 +165,10 @@ typedef struct afs_cred { /* maps to task field: */ int cr_ngroups; struct afs_cred *cr_next; } cred_t; -#define AFS_UCRED struct afs_cred -#define AFS_PROC struct task_struct + +typedef struct afs_cred afs_ucred_t; +typedef struct task_struct afs_proc_t; + #if !defined(current_cred) #define current_gid() (current->gid) #define current_uid() (current->uid) diff --git a/src/afs/LINUX24/osi_misc.c b/src/afs/LINUX24/osi_misc.c index d4fec6c..814ebf3 100644 --- a/src/afs/LINUX24/osi_misc.c +++ b/src/afs/LINUX24/osi_misc.c @@ -24,7 +24,7 @@ #endif int afs_osicred_initialized = 0; -AFS_UCRED afs_osi_cred; +afs_ucred_t afs_osi_cred; void afs_osi_SetTime(osi_timeval_t * tvp) diff --git a/src/afs/LINUX24/osi_prototypes.h b/src/afs/LINUX24/osi_prototypes.h index 9bc8bca..a9b9b89 100644 --- a/src/afs/LINUX24/osi_prototypes.h +++ b/src/afs/LINUX24/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, AFS_UCRED *cr, +extern int osi_linux_nfs_initreq(struct vrequest *av, afs_ucred_t *cr, int *code); extern void osi_linux_nfssrv_init(void); extern void osi_linux_nfssrv_shutdown(void); @@ -71,13 +71,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, AFS_UCRED *acred, +extern void osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *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, AFS_UCRED *credp); +extern void osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp); extern void osi_VM_Truncate(struct vcache *avc, int alen, - AFS_UCRED *acred); + afs_ucred_t *acred); /* osi_vfsops.c */ extern void vattr2inode(struct inode *ip, struct vattr *vp); diff --git a/src/afs/LINUX24/osi_vm.c b/src/afs/LINUX24/osi_vm.c index 6c602d6..747e37b 100644 --- a/src/afs/LINUX24/osi_vm.c +++ b/src/afs/LINUX24/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, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync) { struct inode *ip = AFSTOV(avc); @@ -120,7 +120,7 @@ osi_VM_StoreAllSegments(struct vcache *avc) * then these callers should be updated. */ void -osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) struct inode *ip = AFSTOV(avc); @@ -142,7 +142,7 @@ osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *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 3777af1..09db04b 100644 --- a/src/afs/NBSD/osi_file.c +++ b/src/afs/NBSD/osi_file.c @@ -17,7 +17,7 @@ int afs_osicred_initialized = 0; -AFS_UCRED afs_osi_cred; +afs_ucred_t 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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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 e8d3021..a8b659b 100644 --- a/src/afs/NBSD/osi_machdep.h +++ b/src/afs/NBSD/osi_machdep.h @@ -32,8 +32,8 @@ extern struct timeval time; #define osi_Time() (time.tv_sec) #define afs_hz hz -#define AFS_UCRED struct ucred -#define AFS_PROC struct proc +typedef struct ucred afs_ucred_t; +typedef struct proc afs_proc_t; #define afs_bufferpages bufpages diff --git a/src/afs/NBSD/osi_vm.c b/src/afs/NBSD/osi_vm.c index 02a87f5..4d5bd11 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, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync) { #ifdef SECRETLY_OSF1 ReleaseWriteLock(&avc->lock); @@ -178,7 +178,7 @@ osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { #ifdef SECRETLY_OSF1 ubc_flush_dirty(((struct vnode *)avc)->v_object, 0); @@ -193,7 +193,7 @@ osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *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 a6b4c1a..c62bdeb 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; - AFS_UCRED *acred; + afs_ucred_t *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; - AFS_UCRED *acred; + afs_ucred_t *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; - AFS_UCRED *acred; + afs_ucred_t *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; - AFS_UCRED *acred; + afs_ucred_t *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; - AFS_UCRED *acred; + afs_ucred_t *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; - AFS_UCRED *acred; + afs_ucred_t *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; - AFS_UCRED *acred; + afs_ucred_t *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; - AFS_UCRED *acred; + afs_ucred_t *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; - AFS_UCRED *acred; + afs_ucred_t *acred; { AFS_GLOCK(); afs_InactiveVCache(avc, acred); diff --git a/src/afs/OBSD/osi_file.c b/src/afs/OBSD/osi_file.c index 10a2b84..b9c7b82 100644 --- a/src/afs/OBSD/osi_file.c +++ b/src/afs/OBSD/osi_file.c @@ -17,7 +17,7 @@ int afs_osicred_initialized; -AFS_UCRED afs_osi_cred; +afs_ucred_t 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 4b09601..b3a6f5ab 100644 --- a/src/afs/OBSD/osi_machdep.h +++ b/src/afs/OBSD/osi_machdep.h @@ -87,8 +87,9 @@ extern void osi_obsd_Free(void *p, size_t asize); #endif /* AFS_OBSD42_ENV */ /* proc, cred */ -#define AFS_PROC struct proc -#define AFS_UCRED struct ucred +typedef struct proc afs_proc_t; +typedef struct ucred afs_ucred_t; + #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 f7524c0..9c4a8c4 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, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync) { ReleaseWriteLock(&avc->lock); osi_VM_FlushVCache(avc, NULL); @@ -94,7 +94,7 @@ osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { struct vnode *vp = AFSTOV(avc); @@ -112,7 +112,7 @@ osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) * it only works on Solaris. */ void -osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *acred) { uvm_vnp_setsize(AFSTOV(avc), alen); } diff --git a/src/afs/OBSD/osi_vnodeops.c b/src/afs/OBSD/osi_vnodeops.c index 9234e62..45759ae 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, - AFS_UCRED *acred, pid_t clid); + afs_ucred_t *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 2bfe283..799a4e75 100644 --- a/src/afs/SOLARIS/osi_file.c +++ b/src/afs/SOLARIS/osi_file.c @@ -18,7 +18,7 @@ int afs_osicred_initialized = 0; -AFS_UCRED afs_osi_cred; +afs_ucred_t 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(AFS_UCRED)); + memset((char *)&afs_osi_cred, 0, sizeof(afs_ucred_t)); 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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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) { - AFS_UCRED *oldCred; + afs_ucred_t *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 5ada73b..0353d18 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; - AFS_UCRED *credp; + afs_ucred_t *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) - AFS_UCRED *credp; + afs_ucred_t *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), (AFS_UCRED *)0); + dnlc_enter(ITOV(ip), "a", ITOV(ip), (afs_ucred_t *)0); #endif } @@ -144,7 +144,7 @@ int CrSync = 1; afs_syscall_icreate(dev, near_inode, param1, param2, param3, param4, rvp, credp) rval_t *rvp; - AFS_UCRED *credp; + afs_ucred_t *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; - AFS_UCRED *credp; + afs_ucred_t *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; - AFS_UCRED *credp; + afs_ucred_t *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 065d6cd..56b2bdd 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 struct cred -#define AFS_PROC struct proc +typedef struct cred afs_ucred_t; +typedef struct proc afs_proc_t; /* * Time related macros diff --git a/src/afs/SOLARIS/osi_prototypes.h b/src/afs/SOLARIS/osi_prototypes.h index 54b6175..5f663e9 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, AFS_UCRED *credp); + int flags, afs_ucred_t *credp); diff --git a/src/afs/SOLARIS/osi_vfsops.c b/src/afs/SOLARIS/osi_vfsops.c index 870cc59..01ce783 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, - AFS_UCRED *credp) + afs_ucred_t *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, AFS_UCRED *credp) +afs_unmount(struct vfs *afsp, int flag, afs_ucred_t *credp) #else int -afs_unmount(struct vfs *afsp, AFS_UCRED *credp) +afs_unmount(struct vfs *afsp, afs_ucred_t *credp) #endif { AFS_GLOCK(); @@ -199,7 +199,7 @@ afs_statvfs(struct vfs *afsp, struct statvfs *abp) } int -afs_sync(struct vfs *afsp, short flags, AFS_UCRED *credp) +afs_sync(struct vfs *afsp, short flags, afs_ucred_t *credp) { return 0; } diff --git a/src/afs/SOLARIS/osi_vm.c b/src/afs/SOLARIS/osi_vm.c index 5920080..a6a58f5 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, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync) { AFS_GUNLOCK(); #if defined(AFS_SUN56_ENV) @@ -144,7 +144,7 @@ osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) * Locking: No lock is held, not even the global lock. */ void -osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { extern int afs_pvn_vptrunc; @@ -161,7 +161,7 @@ osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) * be called first, since it causes a pagein. */ void -osi_VM_PreTruncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_PreTruncate(struct vcache *avc, int alen, afs_ucred_t *acred) { page_t *pp; int pageOffset = (alen & PAGEOFFSET); @@ -187,7 +187,7 @@ osi_VM_PreTruncate(struct vcache *avc, int alen, AFS_UCRED *acred) * Pageins are blocked (activeV is raised). */ void -osi_VM_Truncate(struct vcache *avc, int alen, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *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 acb7879..90ee351 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, - AFS_UCRED *credp) + afs_ucred_t *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, - AFS_UCRED *credp) + afs_ucred_t *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, - AFS_UCRED *acred, caller_context_t *ct) + afs_ucred_t *acred, caller_context_t *ct) #else int afs_vmread(register struct vnode *avp, struct uio *auio, int ioflag, - AFS_UCRED *acred) + afs_ucred_t *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, - AFS_UCRED *acred, caller_context_t *ct) + afs_ucred_t *acred, caller_context_t *ct) #else int afs_vmwrite(register struct vnode *avp, struct uio *auio, int ioflag, - AFS_UCRED *acred) + afs_ucred_t *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, AFS_UCRED *acred) + enum seg_rw rw, afs_ucred_t *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, AFS_UCRED *acred) + enum seg_rw rw, afs_ucred_t *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, AFS_UCRED *acred) + enum seg_rw rw, afs_ucred_t *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, - AFS_UCRED *cred) + afs_ucred_t *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, AFS_UCRED *credp) + size_t * lenp, int flags, afs_ucred_t *credp) #elif defined(AFS_SUN56_ENV) afs_putapage(struct vnode *vp, struct page *pages, u_offset_t * offp, - u_int * lenp, int flags, AFS_UCRED *credp) + u_int * lenp, int flags, afs_ucred_t *credp) #else afs_putapage(struct vnode *vp, struct page *pages, u_int * offp, - u_int * lenp, int flags, AFS_UCRED *credp) + u_int * lenp, int flags, afs_ucred_t *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, AFS_UCRED *acred) + int ioflag, afs_ucred_t *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, 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_t *cred) { struct segvn_crargs crargs; register afs_int32 code; @@ -1102,10 +1102,10 @@ afs_map(struct vnode *vp, offset_t off, struct as *as, caddr_t *addr, u_int len, int #ifdef AFS_SUN511_ENV afs_pathconf(struct vnode *vp, int cmd, u_long *outdatap, - register AFS_UCRED *credp, caller_context_t *ct) + register afs_ucred_t *credp, caller_context_t *ct) #else afs_pathconf(struct vnode *vp, int cmd, u_long *outdatap, - register AFS_UCRED *credp) + register afs_ucred_t *credp) #endif /* AFS_SUN511_ENV */ { AFS_STATCNT(afs_cntl); @@ -1183,13 +1183,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, AFS_UCRED *credp) + offset_t off, struct flk_callback *flkcb, afs_ucred_t *credp) #elif defined(AFS_SUN56_ENV) afs_frlock(struct vnode *vnp, int cmd, struct flock64 *ap, int flag, - offset_t off, AFS_UCRED *credp) + offset_t off, afs_ucred_t *credp) #else afs_frlock(struct vnode *vnp, int cmd, struct flock *ap, int flag, - offset_t off, AFS_UCRED *credp) + offset_t off, afs_ucred_t *credp) #endif { register afs_int32 code = 0; @@ -1231,10 +1231,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, AFS_UCRED *credp) + offset_t off, afs_ucred_t *credp) #else afs_space(struct vnode *vnp, int cmd, struct flock *ap, int flag, - offset_t off, AFS_UCRED *credp) + offset_t off, afs_ucred_t *credp) #endif { register afs_int32 code = EINVAL; @@ -1345,59 +1345,59 @@ 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, - AFS_UCRED *acred); + afs_ucred_t *acred); extern int gafs_close(register struct vcache *avc, afs_int32 aflags, - int count, offset_t offset, AFS_UCRED *acred); + int count, offset_t offset, afs_ucred_t *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, AFS_UCRED *acred); + int flags, afs_ucred_t *acred); extern int gafs_getattr(register struct vcache *avc, register struct vattr *attrs, int flags, - AFS_UCRED *acred); + afs_ucred_t *acred); extern int gafs_setattr(register struct vcache *avc, register struct vattr *attrs, int flags, - AFS_UCRED *acred); + afs_ucred_t *acred); extern int gafs_lookup(register struct vcache *adp, char *aname, register struct vcache **avcp, struct pathname *pnp, - int flags, struct vnode *rdir, AFS_UCRED *acred); + int flags, struct vnode *rdir, afs_ucred_t *acred); extern int gafs_remove(register struct vcache *adp, char *aname, - AFS_UCRED *acred); + afs_ucred_t *acred); extern int gafs_link(register struct vcache *adp, register struct vcache *avc, - char *aname, AFS_UCRED *acred); + char *aname, afs_ucred_t *acred); extern int gafs_rename(register struct vcache *aodp, char *aname1, register struct vcache *andp, char *aname2, - AFS_UCRED *acred); + afs_ucred_t *acred); extern int gafs_symlink(register struct vcache *adp, char *aname, struct vattr *attrs, register char *atargetName, - AFS_UCRED *acred); + afs_ucred_t *acred); extern int gafs_rmdir(register struct vcache *adp, char *aname, - struct vnode *cdirp, AFS_UCRED *acred); + struct vnode *cdirp, afs_ucred_t *acred); extern int gafs_mkdir(register struct vcache *adp, char *aname, struct vattr *attrs, register struct vcache **avcp, - AFS_UCRED *acred); + afs_ucred_t *acred); extern int #ifdef AFS_SUN53_ENV -gafs_fsync(register struct vcache *avc, int flag, AFS_UCRED *acred); +gafs_fsync(register struct vcache *avc, int flag, afs_ucred_t *acred); #else -gafs_fsync(register struct vcache *avc, AFS_UCRED *acred); +gafs_fsync(register struct vcache *avc, afs_ucred_t *acred); #endif extern int gafs_readlink(register struct vcache *avc, struct uio *auio, - AFS_UCRED *acred); + afs_ucred_t *acred); extern int gafs_readdir(register struct vcache *avc, struct uio *auio, - AFS_UCRED *acred, int *eofp); + afs_ucred_t *acred, int *eofp); extern void gafs_inactive(register struct vcache *avc, - AFS_UCRED *acred); + afs_ucred_t *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, AFS_UCRED *acred); + struct vcache **avcp, afs_ucred_t *acred); #ifdef AFS_SUN511_ENV extern int afs_pathconf(struct vnode *vp, int cmd, u_long *outdatap, - register AFS_UCRED *credp, caller_context_t *ct); + register afs_ucred_t *credp, caller_context_t *ct); #else extern int afs_pathconf(struct vnode *vp, int cmd, u_long *outdatap, - register AFS_UCRED *credp); + register afs_ucred_t *credp); #endif /* AFS_SUN511_ENV */ #if defined(AFS_SUN511_ENV) @@ -1553,7 +1553,7 @@ struct vnodeops *afs_ops = &Afs_vnodeops; int gafs_open(register struct vcache **avcp, afs_int32 aflags, - AFS_UCRED *acred) + afs_ucred_t *acred) { register int code; @@ -1565,7 +1565,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, AFS_UCRED *acred) + offset_t offset, afs_ucred_t *acred) { register int code; @@ -1577,7 +1577,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, AFS_UCRED *acred) + int flags, afs_ucred_t *acred) { register int code; @@ -1590,7 +1590,7 @@ gafs_getattr(register struct vcache *avc, register struct vattr *attrs, int gafs_setattr(register struct vcache *avc, register struct vattr *attrs, - int flags, AFS_UCRED *acred) + int flags, afs_ucred_t *acred) { register int code; @@ -1603,7 +1603,7 @@ gafs_setattr(register struct vcache *avc, register struct vattr *attrs, int gafs_access(register struct vcache *avc, register afs_int32 amode, int flags, - AFS_UCRED *acred) + afs_ucred_t *acred) { register int code; @@ -1617,7 +1617,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, AFS_UCRED *acred) + struct vnode *rdir, afs_ucred_t *acred) { register int code; @@ -1631,7 +1631,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, - AFS_UCRED *acred) + afs_ucred_t *acred) { register int code; @@ -1642,7 +1642,7 @@ gafs_create(register struct vcache *adp, char *aname, struct vattr *attrs, } int -gafs_remove(register struct vcache *adp, char *aname, AFS_UCRED *acred) +gafs_remove(register struct vcache *adp, char *aname, afs_ucred_t *acred) { register int code; @@ -1654,7 +1654,7 @@ gafs_remove(register struct vcache *adp, char *aname, AFS_UCRED *acred) int gafs_link(register struct vcache *adp, register struct vcache *avc, - char *aname, AFS_UCRED *acred) + char *aname, afs_ucred_t *acred) { register int code; @@ -1667,7 +1667,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, - AFS_UCRED *acred) + afs_ucred_t *acred) { register int code; @@ -1699,7 +1699,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, AFS_UCRED *acred) + register struct vcache **avcp, afs_ucred_t *acred) { register int code; @@ -1711,7 +1711,7 @@ gafs_mkdir(register struct vcache *adp, char *aname, struct vattr *attrs, int gafs_rmdir(register struct vcache *adp, char *aname, struct vnode *cdirp, - AFS_UCRED *acred) + afs_ucred_t *acred) { register int code; @@ -1724,7 +1724,7 @@ gafs_rmdir(register struct vcache *adp, char *aname, struct vnode *cdirp, int gafs_readdir(register struct vcache *avc, struct uio *auio, - AFS_UCRED *acred, int *eofp) + afs_ucred_t *acred, int *eofp) { register int code; @@ -1736,7 +1736,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, AFS_UCRED *acred) + register char *atargetName, afs_ucred_t *acred) { register int code; @@ -1748,7 +1748,7 @@ gafs_symlink(register struct vcache *adp, char *aname, struct vattr *attrs, int -gafs_readlink(register struct vcache *avc, struct uio *auio, AFS_UCRED *acred) +gafs_readlink(register struct vcache *avc, struct uio *auio, afs_ucred_t *acred) { register int code; @@ -1760,9 +1760,9 @@ gafs_readlink(register struct vcache *avc, struct uio *auio, AFS_UCRED *acred) int #ifdef AFS_SUN53_ENV -gafs_fsync(register struct vcache *avc, int flag, AFS_UCRED *acred) +gafs_fsync(register struct vcache *avc, int flag, afs_ucred_t *acred) #else -gafs_fsync(register struct vcache *avc, AFS_UCRED *acred) +gafs_fsync(register struct vcache *avc, afs_ucred_t *acred) #endif { register int code; @@ -1778,7 +1778,7 @@ gafs_fsync(register struct vcache *avc, AFS_UCRED *acred) } int -afs_inactive(struct vcache *avc, AFS_UCRED *acred) +afs_inactive(struct vcache *avc, afs_ucred_t *acred) { struct vnode *vp = AFSTOV(avc); if (afs_shuttingdown) @@ -1818,7 +1818,7 @@ afs_inactive(struct vcache *avc, AFS_UCRED *acred) } void -gafs_inactive(register struct vcache *avc, AFS_UCRED *acred) +gafs_inactive(register struct vcache *avc, afs_ucred_t *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 1f63ded..a52dc0e 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, AFS_UCRED *credp) +osi_FlushPages(register struct vcache *avc, afs_ucred_t *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 7a3cc08..f72fd61 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(AFS_UCRED *cred, gid_t * gidset) +afs_getgroups(afs_ucred_t *cred, gid_t * gidset) { int ngrps, savengrps; gid_t *gp; @@ -46,7 +46,7 @@ afs_getgroups(AFS_UCRED *cred, gid_t * gidset) static int -afs_setgroups(AFS_UCRED **cred, int ngroups, gid_t * gidset, +afs_setgroups(afs_ucred_t **cred, int ngroups, gid_t * gidset, int change_parent) { gid_t *gp; @@ -56,7 +56,7 @@ afs_setgroups(AFS_UCRED **cred, int ngroups, gid_t * gidset, if (ngroups > NGROUPS_MAX) return EINVAL; if (!change_parent) - *cred = (AFS_UCRED *)crcopy(*cred); + *cred = (afs_ucred_t *)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 2eea2ba..ad08918 100644 --- a/src/afs/UKERNEL/osi_machdep.h +++ b/src/afs/UKERNEL/osi_machdep.h @@ -26,9 +26,15 @@ #define OSI_WAITHASH_SIZE 128 /* must be power of two */ #define MAX_HOSTADDR 32 -#define AFS_UCRED struct usr_ucred +/* XXX + * + * UKERNEL cannot trivially make use of typedef for afs_ucred_t and + * afs_proc_t, as in the present design, the types are already introduced + * with incorrect reference, so fall back to preprocessor for now + */ -#define AFS_PROC struct usr_proc +#define afs_ucred_t struct usr_ucred +#define afs_proc_t struct usr_proc #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 e695dd3..a0e7fd6 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, AFS_UCRED *acred) +osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *acred) { return; } @@ -34,13 +34,13 @@ osi_VM_StoreAllSegments(struct vcache *avc) } void -osi_VM_TryToSmush(struct vcache *avc, AFS_UCRED *acred, int sync) +osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync) { return; } void -osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp) +osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp) { return; } diff --git a/src/afs/UKERNEL/osi_vnodeops.c b/src/afs/UKERNEL/osi_vnodeops.c index f2d6d55..ecfa51a 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, AFS_UCRED *acred) +afs_inactive(struct vcache *avc, afs_ucred_t *acred) { if (afs_shuttingdown) return 0; diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h index 8645894..bb44e81 100644 --- a/src/afs/UKERNEL/sysincludes.h +++ b/src/afs/UKERNEL/sysincludes.h @@ -223,9 +223,9 @@ typedef unsigned int fsblkcnt_t; #define vattr usr_vattr #define buf usr_buf #define statfs usr_statfs -#define ucred usr_ucred +/* #define ucred usr_ucred */ #define user usr_user -#define proc usr_proc +/* #define proc usr_proc */ #define file usr_file #define dirent usr_dirent #define flock usr_flock @@ -1225,44 +1225,44 @@ struct usr_socket { ((sizeof (struct usr_dirent)+4 - (MAXNAMLEN+1)) + (((len)+1 + 3) &~ 3)) struct vcache; -#define AFS_UCRED struct usr_ucred +#define afs_ucred_t struct usr_ucred #define AFS_FLOCK flock struct usr_vnodeops { - int (*vn_open) (struct vcache **, afs_int32, AFS_UCRED *); - int (*vn_close) (struct vcache *, afs_int32, AFS_UCRED *); + int (*vn_open) (struct vcache **, afs_int32, afs_ucred_t *); + int (*vn_close) (struct vcache *, afs_int32, afs_ucred_t *); 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 *, AFS_UCRED *); - int (*vn_setattr) (struct vcache *avc, struct vattr *, AFS_UCRED *); - int (*vn_access) (struct vcache *avc, afs_int32, AFS_UCRED *); + int (*vn_getattr) (struct vcache *avc, struct vattr *, afs_ucred_t *); + int (*vn_setattr) (struct vcache *avc, struct vattr *, afs_ucred_t *); + int (*vn_access) (struct vcache *avc, afs_int32, afs_ucred_t *); int (*vn_lookup) (struct vcache *adp, char *, struct vcache **, - AFS_UCRED *, int); + afs_ucred_t *, int); int (*vn_create) (struct vcache *adp, char *, struct vattr *, - enum vcexcl, int, struct vcache **, AFS_UCRED *); - int (*vn_remove) (struct vcache *adp, char *, AFS_UCRED *); + enum vcexcl, int, struct vcache **, afs_ucred_t *); + int (*vn_remove) (struct vcache *adp, char *, afs_ucred_t *); int (*vn_link) (struct vcache *avc, struct vcache *adp, char *, - AFS_UCRED *); + afs_ucred_t *); int (*vn_rename) (struct vcache *aodp, char *, struct vcache *, char *, - AFS_UCRED *); + afs_ucred_t *); int (*vn_mkdir) (struct vcache *adp, char *, struct vattr *, - struct vcache **, AFS_UCRED *); - int (*vn_rmdir) (struct vcache *adp, char *, AFS_UCRED *); - int (*vn_readdir) (struct vcache *avc, struct uio *, AFS_UCRED *); + struct vcache **, afs_ucred_t *); + int (*vn_rmdir) (struct vcache *adp, char *, afs_ucred_t *); + int (*vn_readdir) (struct vcache *avc, struct uio *, afs_ucred_t *); int (*vn_symlink) (struct vcache *adp, char *, struct vattr *, char *, - 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); + afs_ucred_t *); + int (*vn_readlink) (struct vcache *avc, struct uio *, afs_ucred_t *); + int (*vn_fsync) (struct vcache *avc, afs_ucred_t *); + int (*vn_inactive) (struct vcache *avc, afs_ucred_t *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, - AFS_UCRED *); + afs_ucred_t *); 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 b602673..8e33d36 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, - AFS_UCRED *acred) + afs_ucred_t *acred) #else int afs_access(OSI_VC_DECL(avc), register afs_int32 amode, - AFS_UCRED *acred) + afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *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 e098ba7..beb2a34 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, - AFS_UCRED *acred) + afs_ucred_t *acred) #else int -afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, AFS_UCRED *acred) +afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *acred) #else int afs_setattr(OSI_VC_DECL(avc), register struct vattr *attrs, - AFS_UCRED *acred) + afs_ucred_t *acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_create.c b/src/afs/VNOPS/afs_vnop_create.c index 38b184f..d401818 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, AFS_UCRED *acred) + int amode, struct vcache **avcp, afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *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 e84fa22..bf506b2 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, AFS_UCRED *acred) + register struct vcache **avcp, afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *acred) #else -afs_rmdir(OSI_VC_DECL(adp), char *aname, AFS_UCRED *acred) +afs_rmdir(OSI_VC_DECL(adp), char *aname, afs_ucred_t *acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c index 62a78c0..1d6793f 100644 --- a/src/afs/VNOPS/afs_vnop_flock.c +++ b/src/afs/VNOPS/afs_vnop_flock.c @@ -72,7 +72,7 @@ lockIdSet(struct AFS_FLOCK *flock, struct SimpleLocks *slp, int clid) flid_t flid; get_current_flid(&flid); # else - AFS_PROC *procp = OSI_GET_CURRENT_PROCP(); + afs_proc_t *procp = OSI_GET_CURRENT_PROCP(); # endif if (slp) { @@ -96,7 +96,7 @@ void lockIdSet(struct AFS_FLOCK *flock, struct SimpleLocks *slp, int clid) { # if !defined(AFS_AIX32_ENV) - AFS_PROC *procp = u.u_procp; + afs_proc_t *procp = u.u_procp; # endif if (slp) { @@ -175,9 +175,9 @@ lockIdcmp2(struct AFS_FLOCK *flock1, struct vcache *vp, #else #if !defined(AFS_AIX41_ENV) && !defined(AFS_LINUX20_ENV) && !defined(AFS_SGI65_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) #ifdef AFS_SGI64_ENV - AFS_PROC *procp = curprocp; + afs_proc_t *procp = curprocp; #else /* AFS_SGI64_ENV */ - AFS_PROC *procp = u.u_procp; + afs_proc_t *procp = u.u_procp; #endif /* AFS_SGI64_ENV */ #endif #endif @@ -510,14 +510,14 @@ DoLockWarning(void) #ifdef AFS_OSF_ENV int afs_lockctl(struct vcache * avc, struct eflock * af, int flag, - AFS_UCRED * acred, pid_t clid, off_t offset) + afs_ucred_t * 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, - AFS_UCRED * acred, pid_t clid) + afs_ucred_t * acred, pid_t clid) #else u_int clid = 0; int afs_lockctl(struct vcache * avc, struct AFS_FLOCK * af, int acmd, - AFS_UCRED * acred) + afs_ucred_t * acred) #endif { struct vrequest treq; @@ -894,7 +894,7 @@ GetFlockCount(struct vcache *avc, struct vrequest *areq) extern struct fileops afs_fileops; int -afs_xflock(AFS_PROC *p, void *args, int *retval) +afs_xflock(afs_proc_t *p, void *args, int *retval) #else /* AFS_OSF_ENV */ int afs_xflock(void) diff --git a/src/afs/VNOPS/afs_vnop_link.c b/src/afs/VNOPS/afs_vnop_link.c index 8242178..4bba213 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, - AFS_UCRED *acred) + afs_ucred_t *acred) #else afs_link(struct vcache *avc, OSI_VC_DECL(adp), char *aname, - AFS_UCRED *acred) + afs_ucred_t *acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c index 8d0af39..d5d92be 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, AFS_UCRED *acred, int opflag, int wantparent) +afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *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, AFS_UCRED *acred) +afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, struct pathname *pnp, int flags, struct vnode *rdir, afs_ucred_t *acred) #elif defined(UKERNEL) -afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, AFS_UCRED *acred, int flags) +afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acred, int flags) #else -afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, AFS_UCRED *acred) +afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_open.c b/src/afs/VNOPS/afs_vnop_open.c index 5d18d97..d850f6e 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, - AFS_UCRED *acred) + afs_ucred_t *acred) #else -afs_open(struct vcache **avcp, afs_int32 aflags, AFS_UCRED *acred) +afs_open(struct vcache **avcp, afs_int32 aflags, afs_ucred_t *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 e12db58..ff6c14a 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, - AFS_UCRED *acred, struct vrequest *areq); + afs_ucred_t *acred, struct vrequest *areq); int afs_MemRead(register struct vcache *avc, struct uio *auio, - AFS_UCRED *acred, daddr_t albn, struct buf **abpp, + afs_ucred_t *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, - AFS_UCRED *acred, struct vrequest *areq) + afs_ucred_t *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, - AFS_UCRED *acred, daddr_t albn, struct buf **abpp, + afs_ucred_t *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 b1d8f8b..44295fe 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, AFS_UCRED *acred, +afs_readdir(OSI_VC_DECL(avc), struct uio *auio, afs_ucred_t *acred, int *eofp) #else #if defined(AFS_HPUX100_ENV) -afs_readdir2(OSI_VC_DECL(avc), struct uio *auio, AFS_UCRED *acred) +afs_readdir2(OSI_VC_DECL(avc), struct uio *auio, afs_ucred_t *acred) #else -afs_readdir(OSI_VC_DECL(avc), struct uio *auio, AFS_UCRED *acred) +afs_readdir(OSI_VC_DECL(avc), struct uio *auio, afs_ucred_t *acred) #endif #endif { @@ -905,11 +905,11 @@ afs_readdir(OSI_VC_DECL(avc), struct uio *auio, 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, AFS_UCRED *acred, +afs1_readdir(struct vcache *avc, struct uio *auio, afs_ucred_t *acred, int *eofp) #else int -afs1_readdir(struct vcache *avc, struct uio *auio, AFS_UCRED *acred) +afs1_readdir(struct vcache *avc, struct uio *auio, afs_ucred_t *acred) #endif { struct vrequest treq; diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c index 124d1c9..3fe8cce 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, AFS_UCRED *acred, + register struct vcache *tvc, char *aname, afs_ucred_t *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, AFS_UCRED *acred) +afs_remove(OSI_VC_DECL(adp), char *aname, afs_ucred_t *acred) { struct vrequest treq; register struct dcache *tdc; @@ -479,7 +479,7 @@ afs_remove(OSI_VC_DECL(adp), char *aname, AFS_UCRED *acred) int afs_remunlink(register struct vcache *avc, register int doit) { - AFS_UCRED *cred; + afs_ucred_t *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 ae590b3..902757a 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, AFS_UCRED *acred, struct vrequest *areq) + char *aname2, afs_ucred_t *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, AFS_UCRED *acred) +afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp, char *aname2, struct pathname *npnp, afs_ucred_t *acred) #else -afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp, char *aname2, AFS_UCRED *acred) +afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp, char *aname2, afs_ucred_t *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 63bde22..c192ee0 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, AFS_UCRED *credp) +int afs_ustrategy(register struct buf *abp, afs_ucred_t *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 - AFS_UCRED *credp = u.u_cred; + afs_ucred_t *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 07f6056..fdc088c 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, AFS_UCRED *acred) + char *atargetName, afs_ucred_t *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, AFS_UCRED *acred) +afs_readlink(OSI_VC_DECL(avc), struct uio *auio, afs_ucred_t *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 d6c247f..4b85177 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((AFS_UCRED *)avc->linkData); /* "crheld" in afs_FakeClose */ + crfree((afs_ucred_t *)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, - AFS_UCRED *acred, int noLock) + afs_ucred_t *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, - AFS_UCRED *acred, int noLock) + afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *acred) #elif defined(AFS_SGI64_ENV) afs_close(OSI_VC_DECL(avc), afs_int32 aflags, lastclose_t lastclose, - off_t offset, AFS_UCRED *acred, struct flid *flp) + off_t offset, afs_ucred_t *acred, struct flid *flp) #elif defined(AFS_SGI_ENV) afs_close(OSI_VC_DECL(avc), afs_int32 aflags, lastclose_t lastclose - off_t offset, AFS_UCRED *acred) + off_t offset, afs_ucred_t *acred) #elif defined(AFS_SUN5_ENV) afs_close(OSI_VC_DECL(avc), afs_int32 aflags, int count, offset_t offset, - AFS_UCRED *acred) + afs_ucred_t *acred) #else -afs_close(OSI_VC_DECL(avc), afs_int32 aflags, AFS_UCRED *acred) +afs_close(OSI_VC_DECL(avc), afs_int32 aflags, afs_ucred_t *acred) #endif { register afs_int32 code; @@ -913,16 +913,16 @@ afs_close(OSI_VC_DECL(avc), afs_int32 aflags, AFS_UCRED *acred) int #ifdef AFS_OSF_ENV -afs_fsync(OSI_VC_DECL(avc), int fflags, AFS_UCRED *acred, int waitfor) +afs_fsync(OSI_VC_DECL(avc), int fflags, afs_ucred_t *acred, int waitfor) #else /* AFS_OSF_ENV */ #if defined(AFS_SGI_ENV) || defined(AFS_SUN53_ENV) -afs_fsync(OSI_VC_DECL(avc), int flag, AFS_UCRED *acred +afs_fsync(OSI_VC_DECL(avc), int flag, afs_ucred_t *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), AFS_UCRED *acred) +afs_fsync(OSI_VC_DECL(avc), afs_ucred_t *acred) #endif #endif { diff --git a/src/afs/afs.h b/src/afs/afs.h index 7039d51..0e1842c 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 */ - AFS_UCRED *cred; /* credentials to use for operation */ + afs_ucred_t *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 */ - AFS_UCRED *uncred; + afs_ucred_t *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 05b5720..d867d4e 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 AFS_UCRED *acred, int aflags) +void afs_TransitionToBypass(register struct vcache *avc, register afs_ucred_t *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 AFS_UCRED *acred, int aflags) +void afs_TransitionToCaching(register struct vcache *avc, register afs_ucred_t *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, - AFS_UCRED *acred) + afs_ucred_t *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 AFS_UCRED *acred, + register afs_ucred_t *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 e05f80d..2c69218 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 AFS_UCRED *, int); -void afs_TransitionToCaching(register struct vcache *, register AFS_UCRED *, int); +void afs_TransitionToBypass(register struct vcache *, register afs_ucred_t *, int); +void afs_TransitionToCaching(register struct vcache *, register afs_ucred_t *, 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 AFS_UCRED *, int /* dispatch a no-cache read request */ afs_int32 afs_ReadNoCache(register struct vcache *avc, register struct nocache_read_request *bparms, - AFS_UCRED *acred); + afs_ucred_t *acred); /* no-cache prefetch routine */ afs_int32 -afs_PrefetchNoCache(register struct vcache *avc, register AFS_UCRED *acred, +afs_PrefetchNoCache(register struct vcache *avc, register afs_ucred_t *acred, struct nocache_read_request *bparms); diff --git a/src/afs/afs_chunkops.h b/src/afs/afs_chunkops.h index e49a5ba..06f265b 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, - AFS_UCRED * acred, daddr_t albn, struct buf ** abpp, + afs_ucred_t * acred, daddr_t albn, struct buf ** abpp, int noLock); int (*vwrite) (register struct vcache * avc, struct uio * auio, int aio, - AFS_UCRED * acred, int noLock); + afs_ucred_t * 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 8a235a4..b9247fb 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, AFS_UCRED *acred, + afs_int32 dontwait, afs_int32 ause, afs_ucred_t *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 = (AFS_UCRED *)0; + tb->cred = (afs_ucred_t *)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 d7f8509..8f2c590 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, AFS_UCRED *acred, int sync) +afs_TryToSmush(register struct vcache *avc, afs_ucred_t *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 098e426..de671c7 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, AFS_UCRED *); +static void afs_DisconDiscardAllShadows(int, afs_ucred_t *); 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, - AFS_UCRED *acred) + afs_ucred_t *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, AFS_UCRED *acred) +int afs_ResyncDisconFiles(struct vrequest *areq, afs_ucred_t *acred) { struct afs_conn *tc; struct vcache *tvc; @@ -1297,7 +1297,7 @@ next_file: */ static void -afs_DisconDiscardAllShadows(int squash, AFS_UCRED *acred) { +afs_DisconDiscardAllShadows(int squash, afs_ucred_t *acred) { struct vcache *tvc; while (!QEmpty(&afs_disconShadow)) { @@ -1328,7 +1328,7 @@ afs_DisconDiscardAllShadows(int squash, AFS_UCRED *acred) { * */ void -afs_DisconDiscardAll(AFS_UCRED *acred) { +afs_DisconDiscardAll(afs_ucred_t *acred) { struct vcache *tvc; ObtainWriteLock(&afs_disconDirtyLock, 717); diff --git a/src/afs/afs_dynroot.c b/src/afs/afs_dynroot.c index 364d7ea..b57c881 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, AFS_UCRED *acred, char *aname) +afs_DynrootVOPRemove(struct vcache *avc, afs_ucred_t *acred, char *aname) { struct afs_dynSymlink **tpps; struct afs_dynSymlink *tps; @@ -833,7 +833,7 @@ afs_DynrootVOPRemove(struct vcache *avc, AFS_UCRED *acred, char *aname) * Create a temporary symlink entry in /afs. */ int -afs_DynrootVOPSymlink(struct vcache *avc, AFS_UCRED *acred, +afs_DynrootVOPSymlink(struct vcache *avc, afs_ucred_t *acred, char *aname, char *atargetName) { struct afs_dynSymlink *tps; diff --git a/src/afs/afs_init.c b/src/afs/afs_init.c index b55ae7a..6954adf 100644 --- a/src/afs/afs_init.c +++ b/src/afs/afs_init.c @@ -598,8 +598,8 @@ afs_ResourceInit(int preallocs) static void afs_procsize_init(void) { - AFS_PROC *p0; /* pointer to process 0 */ - AFS_PROC *pN; /* pointer to process 0's first child */ + afs_proc_t *p0; /* pointer to process 0 */ + afs_proc_t *pN; /* pointer to process 0's first child */ #ifdef AFS_AIX51_ENV struct pvproc *pV; #endif @@ -607,7 +607,7 @@ afs_procsize_init(void) ptrdiff_t pN_offset; int procsize; - p0 = (AFS_PROC *)v.vb_proc; + p0 = (afs_proc_t *)v.vb_proc; if (!p0) { afs_gcpags = AFS_GCPAGS_EPROC0; return; diff --git a/src/afs/afs_nfsclnt.c b/src/afs/afs_nfsclnt.c index 0c8a63e..1febbbf 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, - AFS_UCRED **cred, + afs_ucred_t **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, - AFS_UCRED *credp, struct exportinfo *exp) + afs_ucred_t *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 619d543..d8d2c0e 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, - AFS_UCRED *crp) + afs_ucred_t *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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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, - AFS_UCRED *crp) + afs_ucred_t *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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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; - AFS_UCRED *svcred = curthread->t_cred; - curthread->t_cred = (AFS_UCRED *)crp; + afs_ucred_t *svcred = curthread->t_cred; + curthread->t_cred = (afs_ucred_t *)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 b2d8c28..85713a3 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 -AFS_UCRED *afs_osi_credp; +afs_ucred_t *afs_osi_credp; #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) kmutex_t afs_global_lock; @@ -59,7 +59,7 @@ struct lock__bsd__ afs_global_lock; #if defined(AFS_XBSD_ENV) && !defined(AFS_FBSD50_ENV) struct lock afs_global_lock; -AFS_PROC *afs_global_owner; +afs_proc_t *afs_global_owner; #endif #ifdef AFS_FBSD50_ENV struct mtx afs_global_mtx; @@ -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(AFS_UCRED)); + memset(&afs_osi_cred, 0, sizeof(afs_ucred_t)); #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 e91c229..bc352b6 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 AFS_UCRED afs_osi_cred, *afs_osi_credp; +extern afs_ucred_t 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 0565183..54c4c98 100644 --- a/src/afs/afs_osi_gcpags.c +++ b/src/afs/afs_osi_gcpags.c @@ -28,7 +28,7 @@ void afs_osi_TraverseProcTable(void) { - AFS_PROC *prp; + afs_proc_t *prp; for (prp = practive; prp != NULL; prp = prp->p_next) { afs_GCPAGs_perproc_func(prp); } @@ -99,7 +99,7 @@ SGI_ProcScanFunc(void *p, void *arg, int mode) static int SGI_ProcScanFunc(proc_t * p, void *arg, int mode) { - afs_int32(*perproc_func) (AFS_PROC *) = arg; + afs_int32(*perproc_func) (afs_proc_t *) = arg; int code = 0; /* we pass in the function pointer for arg, * mode ==0 for startup call, ==1 for each valid proc, @@ -126,7 +126,7 @@ afs_osi_TraverseProcTable(void) void afs_osi_TraverseProcTable(void) { - AFS_PROC *p; + afs_proc_t *p; int i; /* @@ -140,8 +140,8 @@ afs_osi_TraverseProcTable(void) #ifndef AFS_AIX51_ENV simple_lock(&proc_tbl_lock); #endif - for (p = (AFS_PROC *)v.vb_proc, i = 0; p < max_proc; - p = (AFS_PROC *)((char *)p + afs_gcpags_procsize), i++) { + for (p = (afs_proc_t *)v.vb_proc, i = 0; p < max_proc; + p = (afs_proc_t *)((char *)p + afs_gcpags_procsize), i++) { #ifdef AFS_AIX51_ENV if (p->p_pvprocp->pv_stat == SNONE) @@ -210,7 +210,7 @@ afs_osi_TraverseProcTable(void) void afs_osi_TraverseProcTable(void) { - AFS_PROC *p; + afs_proc_t *p; LIST_FOREACH(p, &allproc, p_list) { if (p->p_stat == SIDL) continue; @@ -282,19 +282,19 @@ afs_osi_TraverseProcTable() #endif /* return a pointer (sometimes a static copy ) to the cred for a - * given AFS_PROC. + * given afs_proc_t. * subsequent calls may overwrite the previously returned value. */ #if defined(AFS_SGI65_ENV) -const AFS_UCRED * -afs_osi_proc2cred(AFS_PROC * p) +const afs_ucred_t * +afs_osi_proc2cred(afs_proc_t * p) { return NULL; } #elif defined(AFS_HPUX_ENV) -const AFS_UCRED * -afs_osi_proc2cred(AFS_PROC * p) +const afs_ucred_t * +afs_osi_proc2cred(afs_proc_t * p) { if (!p) return; @@ -318,10 +318,10 @@ afs_osi_proc2cred(AFS_PROC * p) * around calls to this function. */ -const AFS_UCRED * -afs_osi_proc2cred(AFS_PROC * pproc) +const afs_ucred_t * +afs_osi_proc2cred(afs_proc_t * pproc) { - AFS_UCRED *pcred = 0; + afs_ucred_t *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 AFS_UCRED cred; + static afs_ucred_t 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 AFS_UCRED * -afs_osi_proc2cred(AFS_PROC * pr) +const afs_ucred_t * +afs_osi_proc2cred(afs_proc_t * pr) { - AFS_UCRED *rv = NULL; + afs_ucred_t *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 AFS_UCRED * -afs_osi_proc2cred(AFS_PROC * pr) +const afs_ucred_t * +afs_osi_proc2cred(afs_proc_t * pr) { - AFS_UCRED *rv = NULL; - static AFS_UCRED cr; + afs_ucred_t *rv = NULL; + static afs_ucred_t 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 AFS_UCRED * -afs_osi_proc2cred(AFS_PROC * pr) +const afs_ucred_t * +afs_osi_proc2cred(afs_proc_t * pr) { - AFS_UCRED *rv = NULL; - static AFS_UCRED cr; + afs_ucred_t *rv = NULL; + static afs_ucred_t 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 AFS_UCRED * -afs_osi_proc2cred(AFS_PROC * pr) +const afs_ucred_t * +afs_osi_proc2cred(afs_proc_t * pr) { - AFS_UCRED *rv = NULL; - static AFS_UCRED cr; + afs_ucred_t *rv = NULL; + static afs_ucred_t cr; if (pr == NULL) { return NULL; @@ -532,10 +532,10 @@ afs_osi_proc2cred(AFS_PROC * pr) } #endif #else -const AFS_UCRED * -afs_osi_proc2cred(AFS_PROC * pr) +const afs_ucred_t * +afs_osi_proc2cred(afs_proc_t * pr) { - AFS_UCRED *rv = NULL; + afs_ucred_t *rv = NULL; if (pr == NULL) { return NULL; diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c index efc2da5..7d9e540 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(AFS_UCRED **acred) +afs_pag_sleep(afs_ucred_t **acred) { int rv = 0; @@ -167,7 +167,7 @@ afs_pag_sleep(AFS_UCRED **acred) } static int -afs_pag_wait(AFS_UCRED **acred) +afs_pag_wait(afs_ucred_t **acred) { if (afs_pag_sleep(acred)) { if (!afs_pag_sleepcnt) { @@ -190,20 +190,20 @@ afs_pag_wait(AFS_UCRED **acred) int #if defined(AFS_SUN5_ENV) -afs_setpag(AFS_UCRED **credpp) +afs_setpag(afs_ucred_t **credpp) #elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) -afs_setpag(AFS_PROC *p, void *args, int *retval) +afs_setpag(afs_proc_t *p, void *args, int *retval) #else afs_setpag(void) #endif { #if defined(AFS_SUN5_ENV) - AFS_UCRED **acred = *credpp; + afs_ucred_t **acred = *credpp; #elif defined(AFS_OBSD_ENV) - AFS_UCRED **acred = &p->p_ucred; + afs_ucred_t **acred = &p->p_ucred; #else - AFS_UCRED **acred = NULL; + afs_ucred_t **acred = NULL; #endif int code = 0; @@ -248,19 +248,19 @@ afs_setpag(void) } #elif defined(AFS_LINUX20_ENV) { - AFS_UCRED *credp = crref(); + afs_ucred_t *credp = crref(); code = AddPag(genpag(), &credp); crfree(credp); } #elif defined(AFS_DARWIN80_ENV) { - AFS_UCRED *credp = kauth_cred_proc_ref(p); + afs_ucred_t *credp = kauth_cred_proc_ref(p); code = AddPag(p, genpag(), &credp); crfree(credp); } #elif defined(AFS_DARWIN_ENV) { - AFS_UCRED *credp = crdup(p->p_cred->pc_ucred); + afs_ucred_t *credp = crdup(p->p_cred->pc_ucred); code = AddPag(p, genpag(), &credp); crfree(credp); } @@ -292,20 +292,20 @@ afs_setpag(void) */ int #if defined(AFS_SUN5_ENV) -afs_setpag_val(AFS_UCRED **credpp, int pagval) +afs_setpag_val(afs_ucred_t **credpp, int pagval) #elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) -afs_setpag_val(AFS_PROC *p, void *args, int *retval, int pagval) +afs_setpag_val(afs_proc_t *p, void *args, int *retval, int pagval) #else afs_setpag_val(int pagval) #endif { #if defined(AFS_SUN5_ENV) - AFS_UCRED **acred = *credp; + afs_ucred_t **acred = *credp; #elif defined(AFS_OBSD_ENV) - AFS_UCRED **acred = &p->p_ucred; + afs_ucred_t **acred = &p->p_ucred; #else - AFS_UCRED **acred = NULL; + afs_ucred_t **acred = NULL; #endif int code = 0; @@ -349,7 +349,7 @@ afs_setpag_val(int pagval) } #elif defined(AFS_LINUX20_ENV) { - AFS_UCRED *credp = crref(); + afs_ucred_t *credp = crref(); code = AddPag(pagval, &credp); crfree(credp); } @@ -379,7 +379,7 @@ int afs_getpag_val(void) { int pagvalue; - AFS_UCRED *credp = u.u_cred; + afs_ucred_t *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(AFS_PROC *p, afs_int32 aval, AFS_UCRED **credpp) +AddPag(afs_proc_t *p, afs_int32 aval, afs_ucred_t **credpp) #else int -AddPag(afs_int32 aval, AFS_UCRED **credpp) +AddPag(afs_int32 aval, afs_ucred_t **credpp) #endif { afs_int32 code; @@ -426,7 +426,7 @@ AddPag(afs_int32 aval, AFS_UCRED **credpp) int -afs_InitReq(register struct vrequest *av, AFS_UCRED *acred) +afs_InitReq(register struct vrequest *av, afs_ucred_t *acred) { #if defined(AFS_LINUX26_ENV) && !defined(AFS_NONFSTRANS) int code; @@ -537,7 +537,7 @@ afs_get_groups_from_pag(afs_uint32 pag, gid_t * g0p, gid_t * g1p) afs_int32 -PagInCred(AFS_UCRED *cred) +PagInCred(afs_ucred_t *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 59d9db0..25b370e 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, AFS_UCRED *credp) +osi_FlushPages(register struct vcache *avc, afs_ucred_t *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, AFS_UCRED *acred) +osi_ReleaseVM(struct vcache *avc, afs_ucred_t *acred) { #ifdef AFS_SUN5_ENV AFS_GUNLOCK(); diff --git a/src/afs/afs_pag_call.c b/src/afs/afs_pag_call.c index 2fc124e..431c09c 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; - AFS_UCRED *credp; + afs_ucred_t *credp; #else #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) afs_syscall_pioctl(path, com, cmarg, follow, credp) - AFS_UCRED *credp; + afs_ucred_t *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 fae5528..cfe4fa7 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, AFS_UCRED **acred) +int afspag_PUnlog(char *ain, afs_int32 ainSize, afs_ucred_t **acred) { register afs_int32 i; register struct unixuser *tu; @@ -122,7 +122,7 @@ int afspag_PUnlog(char *ain, afs_int32 ainSize, AFS_UCRED **acred) } -int afspag_PSetTokens(char *ain, afs_int32 ainSize, AFS_UCRED **acred) +int afspag_PSetTokens(char *ain, afs_int32 ainSize, afs_ucred_t **acred) { afs_int32 i; register struct unixuser *tu; @@ -173,9 +173,9 @@ int afspag_PSetTokens(char *ain, afs_int32 ainSize, AFS_UCRED **acred) if (set_parent_pag) { #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #if defined(AFS_DARWIN_ENV) - AFS_PROC *p = current_proc(); /* XXX */ + afs_proc_t *p = current_proc(); /* XXX */ #else - AFS_PROC *p = curproc; /* XXX */ + afs_proc_t *p = curproc; /* XXX */ #endif #ifndef AFS_DARWIN80_ENV uprintf("Process %d (%s) tried to change pags in PSetTokens\n", @@ -313,7 +313,7 @@ out: } -int afspag_PSetSysName(char *ain, afs_int32 ainSize, AFS_UCRED **acred) +int afspag_PSetSysName(char *ain, afs_int32 ainSize, afs_ucred_t **acred) { int setsysname, count, t; char *cp, *setp; diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index ba23ebf..e465dcb 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, \ - AFS_UCRED **acred) + afs_ucred_t **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, - AFS_UCRED **acred, - AFS_UCRED *credp); + afs_ucred_t **acred, + afs_ucred_t *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, - AFS_UCRED **acred); + afs_ucred_t **acred); static int Prefetch(uparmtype apath, struct afs_ioctl *adata, int afollow, - AFS_UCRED *acred); + afs_ucred_t *acred); typedef int (*pioctlFunction) (struct vcache *, int, struct vrequest *, char *, char *, afs_int32, afs_int32 *, - AFS_UCRED **); + afs_ucred_t **); static pioctlFunction VpioctlSw[] = { PBogus, /* 0 */ @@ -419,7 +419,7 @@ afs_xioctl(struct afs_ioctl_sys *uap, rval_t *rvp) { #elif defined(AFS_OSF_ENV) int -afs_xioctl(AFS_PROC *p, void *args, long *retval) +afs_xioctl(afs_proc_t *p, void *args, long *retval) { struct a { long fd; @@ -432,7 +432,7 @@ int afs_xioctl(struct thread *td, register struct ioctl_args *uap, register_t *retval) { - AFS_PROC *p = td->td_proc; + afs_proc_t *p = td->td_proc; #elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) struct ioctl_args { int fd; @@ -441,7 +441,7 @@ struct ioctl_args { }; int -afs_xioctl(AFS_PROC *p, register struct ioctl_args *uap, register_t *retval) +afs_xioctl(afs_proc_t *p, register struct ioctl_args *uap, register_t *retval) { #elif defined(AFS_LINUX22_ENV) struct afs_ioctl_sys { @@ -712,7 +712,7 @@ afs_pioctl(struct pioctlargs *uap, rval_t * rvp) } #elif defined(AFS_OSF_ENV) -afs_pioctl(AFS_PROC *p, void *args, int *retval) +afs_pioctl(afs_proc_t *p, void *args, int *retval) { struct a { char *path; @@ -743,7 +743,7 @@ afs_pioctl(struct thread *td, void *args, int *retval) #elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) int -afs_pioctl(AFS_PROC *p, void *args, int *retval) +afs_pioctl(afs_proc_t *p, void *args, int *retval) { struct a { char *path; @@ -776,14 +776,14 @@ afs_pioctl(AFS_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, AFS_UCRED *credp) + rval_t *vvp, afs_ucred_t *credp) #else #ifdef AFS_DARWIN100_ENV afs_syscall64_pioctl(user_addr_t path, unsigned int com, user_addr_t cmarg, - int follow, AFS_UCRED *credp) + int follow, afs_ucred_t *credp) #elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow, - AFS_UCRED *credp) + afs_ucred_t *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 - AFS_UCRED *tmpcred = NULL; + afs_ucred_t *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) - AFS_UCRED *foreigncreds = NULL; + afs_ucred_t *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, AFS_UCRED *credp) + int follow, afs_ucred_t *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, - AFS_UCRED **acred) + afs_ucred_t **acred) { struct vcache *avc; struct vrequest treq; @@ -1567,9 +1567,9 @@ DECL_PIOCTL(PSetTokens) afs_uint32 pag; #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) #if defined(AFS_DARWIN_ENV) - AFS_PROC *p = current_proc(); /* XXX */ + afs_proc_t *p = current_proc(); /* XXX */ #else - AFS_PROC *p = curproc; /* XXX */ + afs_proc_t *p = curproc; /* XXX */ #endif #ifndef AFS_DARWIN80_ENV uprintf("Process %d (%s) tried to change pags in PSetTokens\n", @@ -2290,7 +2290,7 @@ DECL_PIOCTL(PCheckAuth) static int Prefetch(uparmtype apath, struct afs_ioctl *adata, int afollow, - AFS_UCRED *acred) + afs_ucred_t *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, - AFS_UCRED **acred, AFS_UCRED *credp) + afs_ucred_t **acred, 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; - AFS_UCRED *newcred; + afs_ucred_t *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 aa57156..6b78c7a 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, - AFS_UCRED *acred, + afs_ucred_t *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, - AFS_UCRED *acred, int sync); + afs_ucred_t *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, AFS_UCRED *acred, +extern int afs_DynrootVOPRemove(struct vcache *avc, afs_ucred_t *acred, char *aname); -extern int afs_DynrootVOPSymlink(struct vcache *avc, AFS_UCRED *acred, +extern int afs_DynrootVOPSymlink(struct vcache *avc, afs_ucred_t *acred, char *aname, char *atargetName); /* afs_error.c */ @@ -518,7 +518,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, - AFS_UCRED **cred, + afs_ucred_t **cred, afs_int32 host, afs_int32 *pagparam, struct afs_exporter **outexporter); extern void shutdown_nfsclnt(void); @@ -540,8 +540,8 @@ extern void shutdown_osi(void); 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 AFS_UCRED *afs_osi_proc2cred(AFS_PROC * pr); +#if defined(KERNEL) && !defined(UKERNEL) +extern const afs_ucred_t *afs_osi_proc2cred(afs_proc_t * pr); #endif /* afs_osi_alloc.c */ @@ -567,9 +567,9 @@ extern void shutdown_osinet(void); /* afs_osi_pag.c */ #if defined(AFS_SUN5_ENV) -extern int afs_setpag(AFS_UCRED **credpp); +extern int afs_setpag(afs_ucred_t **credpp); #elif defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) -extern int afs_setpag(AFS_PROC *p, void *args, int *retval); +extern int afs_setpag(afs_proc_t *p, void *args, int *retval); #else extern int afs_setpag(void); #endif @@ -577,11 +577,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(AFS_PROC *p, afs_int32 aval, AFS_UCRED **credpp); +extern int AddPag(afs_proc_t *p, afs_int32 aval, afs_ucred_t **credpp); #else -extern int AddPag(afs_int32 aval, AFS_UCRED **credpp); +extern int AddPag(afs_int32 aval, afs_ucred_t **credpp); #endif -extern int afs_InitReq(register struct vrequest *av, AFS_UCRED *acred); +extern int afs_InitReq(register struct vrequest *av, afs_ucred_t *acred); #if defined(UKERNEL) extern afs_uint32 afs_get_pag_from_groups(gid_t g0a, gid_t g1a); #else @@ -590,7 +590,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(AFS_UCRED *cred); +extern afs_int32 PagInCred(afs_ucred_t *cred); /* afs_osi_uio.c */ extern int afsio_copy(struct uio *ainuio, struct uio *aoutuio, @@ -601,11 +601,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, - AFS_UCRED *credp); + afs_ucred_t *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, AFS_UCRED *acred); +extern void osi_ReleaseVM(struct vcache *avc, afs_ucred_t *acred); #endif @@ -652,10 +652,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 *, AFS_UCRED *); -extern int afs_syscall_iopen(dev_t, int, int, rval_t *, AFS_UCRED *); + rval_t *, afs_ucred_t *); +extern int afs_syscall_iopen(dev_t, int, int, rval_t *, afs_ucred_t *); extern int afs_syscall_iincdec(dev_t, int, int, int, rval_t *, - AFS_UCRED *); + afs_ucred_t *); #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 *); @@ -692,12 +692,12 @@ extern void shutdown_osifile(void); /* ARCH/osi_groups.c */ #if defined(UKERNEL) -extern int usr_setpag(struct usr_ucred **cred, afs_uint32 pagvalue, +extern int usr_setpag(afs_ucred_t **cred, afs_uint32 pagvalue, afs_uint32 * newpag, int change_parent); #else # if defined AFS_XBSD_ENV # if !defined(AFS_DFBSD_ENV) -extern int setpag(AFS_PROC *proc, struct ucred **cred, afs_uint32 pagvalue, +extern int setpag(afs_proc_t *proc, struct ucred **cred, afs_uint32 pagvalue, afs_uint32 * newpag, int change_parent); # endif # endif @@ -707,11 +707,11 @@ extern int setpag(AFS_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, AFS_UCRED *acred, +extern void osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred, int sync); -extern void osi_VM_FlushPages(struct vcache *avc, AFS_UCRED *credp); +extern void osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp); extern void osi_VM_Truncate(struct vcache *avc, int alen, - AFS_UCRED *acred); + afs_ucred_t *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); @@ -719,7 +719,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, - AFS_UCRED *acred); + afs_ucred_t *acred); #endif @@ -736,7 +736,7 @@ extern int numvnodes; /* number vnodes in use now */ extern struct vfs_ubcops afs_ubcops; #endif #endif -extern int afs_inactive(struct vcache *avc, AFS_UCRED *acred); +extern int afs_inactive(struct vcache *avc, afs_ucred_t *acred); /* afs_osifile.c */ @@ -771,11 +771,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, - AFS_UCRED **acred); + afs_ucred_t **acred); extern int afspag_PSetTokens(char *ain, afs_int32 ainSize, - AFS_UCRED **acred); + afs_ucred_t **acred); extern int afspag_PSetSysName(char *ain, afs_int32 ainSize, - AFS_UCRED **acred); + afs_ucred_t **acred); /* afs_pioctl.c */ extern struct VenusFid afs_rootFid; @@ -786,14 +786,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, \ - AFS_UCRED *credp); + afs_ucred_t *credp); #endif #ifdef AFS_SUN5_ENV extern int afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, - int follow, rval_t *rvp, AFS_UCRED *credp); + int follow, rval_t *rvp, afs_ucred_t *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, AFS_UCRED *credp); + int follow, afs_ucred_t *credp); #else extern int afs_syscall_pioctl(char *path, unsigned int com, caddr_t cmarg, int follow); @@ -811,7 +811,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, - AFS_UCRED *acred); + afs_ucred_t *acred); /* afs_server.c */ extern afs_rwlock_t afs_xsrvAddr; @@ -895,7 +895,7 @@ extern int Afs_syscall(void); #ifdef UKERNEL extern void uafs_Shutdown(void); extern void osi_ReleaseVM(struct vcache *avc, int len, - struct usr_ucred *credp); + afs_ucred_t *credp); extern int osi_GetTime(struct timeval *tv); extern int iodone(struct usr_buf *bp); extern int usr_ioctl(void); @@ -903,7 +903,7 @@ extern int lookupname(char *fnamep, int segflg, int followlink, struct usr_vnode **compvpp); extern int usr_uiomove(char *kbuf, int n, int rw, struct usr_uio *uio); extern int afs_osi_VOP_RDWR(struct usr_vnode *vnodeP, struct usr_uio *uioP, - int rw, int flags, struct usr_ucred *credP); + int rw, int flags, afs_ucred_t *credP); #endif @@ -916,7 +916,7 @@ extern struct unixuser *afs_GetUser(register afs_int32 auid, afs_int32 acell, afs_int32 locktype); #if AFS_GCPAGS extern afs_int32 afs_GCPAGs(afs_int32 * ReleasedCount); -extern void afs_GCPAGs_perproc_func(AFS_PROC * pproc); +extern void afs_GCPAGs_perproc_func(afs_proc_t * pproc); #endif /* AFS_GCPAGS */ extern void afs_ComputePAGStats(void); extern void afs_PutUser(register struct unixuser *au, afs_int32 locktype); @@ -996,7 +996,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, AFS_UCRED *acred); +extern void afs_InactiveVCache(struct vcache *avc, afs_ucred_t *acred); extern struct vcache *afs_LookupVCache(struct VenusFid *afid, struct vrequest *areq, afs_int32 * cached, struct vcache *adp, @@ -1030,7 +1030,7 @@ extern int afs_RemoteLookup(register struct VenusFid *afid, struct AFSCallBack *CallBackp, struct server **serverp, struct AFSVolSync *tsyncp); -extern void afs_ResetVCache(struct vcache *, AFS_UCRED *); +extern void afs_ResetVCache(struct vcache *, afs_ucred_t *); extern afs_int32 afs_NFSFindVCache(struct vcache **avcp, struct VenusFid *afid); extern void afs_vcacheInit(int astatSize); @@ -1046,33 +1046,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, - AFS_UCRED *acred); + afs_ucred_t *acred); #else extern int afs_access(OSI_VC_DECL(avc), register afs_int32 amode, - AFS_UCRED *acred); + afs_ucred_t *acred); #endif extern int afs_getRights(OSI_VC_DECL(avc), register afs_int32 arights, - AFS_UCRED *acred); + afs_ucred_t *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, - AFS_UCRED *acred); + afs_ucred_t *acred); #else extern int afs_getattr(OSI_VC_DECL(avc), struct vattr *attrs, - AFS_UCRED *acred); + afs_ucred_t *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, AFS_UCRED *acred); + int flags, afs_ucred_t *acred); #else extern int afs_setattr(OSI_VC_DECL(avc), register struct vattr *attrs, - AFS_UCRED *acred); + afs_ucred_t *acred); #endif /* VNOPS/afs_vnop_create.c */ @@ -1082,11 +1082,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, - AFS_UCRED *acred); + afs_ucred_t *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, - AFS_UCRED *acred); + afs_ucred_t *acred); #endif /* AFS_SGI64_ENV */ #endif /* AFS_OSF_ENV */ extern int afs_LocalHero(register struct vcache *avc, @@ -1096,12 +1096,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, AFS_UCRED *acred); + register struct vcache **avcp, afs_ucred_t *acred); #if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) extern int afs_rmdir(OSI_VC_DECL(adp), char *aname, struct vnode *cdirp, - AFS_UCRED *acred); + afs_ucred_t *acred); #else -extern int afs_rmdir(OSI_VC_DECL(adp), char *aname, AFS_UCRED *acred); +extern int afs_rmdir(OSI_VC_DECL(adp), char *aname, afs_ucred_t *acred); #endif struct fid; @@ -1126,22 +1126,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, - AFS_UCRED * acred, pid_t clid, off_t offset); + afs_ucred_t * 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, - AFS_UCRED * acred, pid_t clid); + afs_ucred_t * acred, pid_t clid); #else extern int afs_lockctl(struct vcache * avc, struct AFS_FLOCK * af, int acmd, - AFS_UCRED * acred); + afs_ucred_t * 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, - AFS_UCRED *acred); + afs_ucred_t *acred); #else extern int afs_link(struct vcache *avc, OSI_VC_DECL(adp), char *aname, - AFS_UCRED *acred); + afs_ucred_t *acred); #endif /* VNOPS/afs_vnop_lookup.c */ @@ -1165,26 +1165,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, - AFS_UCRED *acred, int opflag, int wantparent); + afs_ucred_t *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, - AFS_UCRED *acred); + afs_ucred_t *acred); #elif defined(UKERNEL) extern int afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, - AFS_UCRED *acred, int flags); + afs_ucred_t *acred, int flags); #else extern int afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, - AFS_UCRED *acred); + afs_ucred_t *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, - AFS_UCRED *acred); + afs_ucred_t *acred); #else extern int afs_open(struct vcache **avcp, afs_int32 aflags, - AFS_UCRED *acred); + afs_ucred_t *acred); #endif @@ -1193,52 +1193,52 @@ extern afs_int32 maxIHint; extern afs_int32 nihints; extern afs_int32 usedihint; extern int afs_MemRead(register struct vcache *avc, struct uio *auio, - AFS_UCRED *acred, daddr_t albn, + afs_ucred_t *acred, daddr_t albn, struct buf **abpp, int noLock); extern int afs_UFSRead(register struct vcache *avc, struct uio *auio, - AFS_UCRED *acred, daddr_t albn, + afs_ucred_t *acred, daddr_t albn, struct buf **abpp, int noLock); extern void afs_PrefetchChunk(struct vcache *avc, struct dcache *adc, - AFS_UCRED *acred, struct vrequest *areq); + afs_ucred_t *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, - AFS_UCRED *acred, int *eofp); + afs_ucred_t *acred, int *eofp); #elif defined(AFS_HPUX100_ENV) extern int afs_readdir2(OSI_VC_DECL(avc), struct uio *auio, - AFS_UCRED *acred); + afs_ucred_t *acred); #else extern int afs_readdir(OSI_VC_DECL(avc), struct uio *auio, - AFS_UCRED *acred); + afs_ucred_t *acred); #endif /* VNOPS/afs_vnop_remove.c */ extern int afsremove(register struct vcache *adp, register struct dcache *tdc, register struct vcache *tvc, char *aname, - AFS_UCRED *acred, struct vrequest *treqp); + afs_ucred_t *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, AFS_UCRED *acred); +extern int afs_remove(OSI_VC_DECL(adp), char *aname, afs_ucred_t *acred); extern char *afs_newname(void); /* VNOPS/afs_vnop_rename.c */ extern int afsrename(struct vcache *aodp, char *aname1, struct vcache *andp, - char *aname2, AFS_UCRED *acred, + char *aname2, afs_ucred_t *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, - AFS_UCRED *acred); + afs_ucred_t *acred); #else extern int afs_rename(OSI_VC_DECL(aodp), char *aname1, struct vcache *andp, - char *aname2, AFS_UCRED *acred); + char *aname2, afs_ucred_t *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, AFS_UCRED *credp); +extern int afs_ustrategy(register struct buf *adp, afs_ucred_t *credp); #else extern int afs_ustrategy(register struct buf *adp); #endif @@ -1250,50 +1250,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, - AFS_UCRED *acred); + afs_ucred_t *acred); extern int afs_readlink(OSI_VC_DECL(avc), struct uio *auio, - AFS_UCRED *acred); + afs_ucred_t *acred); /* VNOPS/afs_vnop_write.c */ extern int afs_MemWrite(register struct vcache *avc, struct uio *auio, - int aio, AFS_UCRED *acred, int noLock); + int aio, afs_ucred_t *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, AFS_UCRED *acred, int noLock); + int aio, afs_ucred_t *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, AFS_UCRED *acred); + lastclose_t lastclose, afs_ucred_t *acred); #elif defined(AFS_SGI64_ENV) extern int afs_close(OSI_VC_DECL(avc), afs_int32 aflags, lastclose_t lastclose, off_t offset, - AFS_UCRED *acred, struct flid *flp); + afs_ucred_t *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, - AFS_UCRED *acred); + afs_ucred_t *acred); #elif defined(AFS_SUN5_ENV) extern int afs_close(OSI_VC_DECL(avc), afs_int32 aflags, int count, - offset_t offset, AFS_UCRED *acred); + offset_t offset, afs_ucred_t *acred); #else extern int afs_close(OSI_VC_DECL(avc), afs_int32 aflags, - AFS_UCRED *acred); + afs_ucred_t *acred); #endif #ifdef AFS_OSF_ENV -extern int afs_fsync(OSI_VC_DECL(avc), int fflags, AFS_UCRED *acred, +extern int afs_fsync(OSI_VC_DECL(avc), int fflags, afs_ucred_t *acred, int waitfor); #elif defined(AFS_SGI65_ENV) -extern int afs_fsync(OSI_VC_DECL(avc), int flags, AFS_UCRED *acred, +extern int afs_fsync(OSI_VC_DECL(avc), int flags, afs_ucred_t *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, AFS_UCRED *acred); +extern int afs_fsync(OSI_VC_DECL(avc), int flag, afs_ucred_t *acred); #else -extern int afs_fsync(OSI_VC_DECL(avc), AFS_UCRED *acred); +extern int afs_fsync(OSI_VC_DECL(avc), afs_ucred_t *acred); #endif diff --git a/src/afs/afs_segments.c b/src/afs/afs_segments.c index 7411b07..1f11051 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, (AFS_UCRED *)0); + osi_ReleaseVM(avc, (afs_ucred_t *)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, AFS_UCRED *acred) + struct vrequest *areq, afs_ucred_t *acred) { register struct dcache *tdc; register afs_int32 code; diff --git a/src/afs/afs_syscall.c b/src/afs/afs_syscall.c index 02fcb40..9f073de 100644 --- a/src/afs/afs_syscall.c +++ b/src/afs/afs_syscall.c @@ -485,7 +485,7 @@ struct afssysa64 { afs_int32 syscall; }; int -afs3_syscall(AFS_PROC *p, void *args, unsigned int *retval) +afs3_syscall(afs_proc_t *p, void *args, unsigned int *retval) { struct afssysa64 *uap64 = NULL; struct afssysa *uap = NULL; @@ -495,7 +495,7 @@ afs3_syscall(p, args, retval) #ifdef AFS_FBSD50_ENV struct thread *p; #else - AFS_PROC *p; + afs_proc_t *p; #endif void *args; long *retval; diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c index b24525b..f6ccf1c 100644 --- a/src/afs/afs_user.c +++ b/src/afs/afs_user.c @@ -593,10 +593,10 @@ static size_t afs_GCPAGs_cred_count = 0; */ #if !defined(LINUX_KEYRING_SUPPORT) && (!defined(STRUCT_TASK_HAS_CRED) || defined(EXPORTED_RCU_READ_LOCK)) void -afs_GCPAGs_perproc_func(AFS_PROC * pproc) +afs_GCPAGs_perproc_func(afs_proc_t * pproc) { afs_int32 pag, hash, uid; - const AFS_UCRED *pcred; + const afs_ucred_t *pcred; afs_GCPAGs_perproc_count++; diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index a03e42d..2c353fd 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, AFS_UCRED *acred) +afs_InactiveVCache(struct vcache *avc, afs_ucred_t *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; - AFS_UCRED *cred = NULL; + afs_ucred_t *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 = (AFS_UCRED *)tvc->linkData; + cred = (afs_ucred_t *)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, AFS_UCRED *acred) { +afs_ResetVCache(struct vcache *avc, afs_ucred_t *acred) { ObtainWriteLock(&afs_xcbhash, 456); afs_DequeueCallback(avc); avc->f.states &= ~(CStatd | CDirty); /* next reference will re-stat */ diff --git a/src/afs/discon.h b/src/afs/discon.h index ac3d917..a042e6d 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, - AFS_UCRED *acred); + afs_ucred_t *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(AFS_UCRED *); +extern void afs_DisconDiscardAll(afs_ucred_t *); #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 a7d1ac7..3b344d6 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, - AFS_UCRED **cred, + afs_ucred_t **cred, afs_uint32 host, afs_int32 pag, struct afs_exporter **expp); diff --git a/src/afs/lock.h b/src/afs/lock.h index 3dc8812..d8e33a7 100644 --- a/src/afs/lock.h +++ b/src/afs/lock.h @@ -38,7 +38,7 @@ struct afs_bozoLock { short count; /* count of excl locks */ char flags; /* bit 1: is anyone waiting? */ char spare; /* for later */ - char *proc; /* process holding the lock, really an AFS_PROC * */ + char *proc; /* process holding the lock, really an afs_proc_t * */ }; #ifndef AFS_NOBOZO_LOCK typedef struct afs_bozoLock afs_bozoLock_t; @@ -107,7 +107,7 @@ typedef struct kthread * afs_lock_tracker_t; #define MyPidxx (u.u_kthreadp) #define MyPidxx2Pid(x) (x ? kt_tid(x) : 0) #else -typedef AFS_PROC * afs_lock_tracker_t; +typedef afs_proc_t * afs_lock_tracker_t; #define MyPidxx (u.u_procp) #define MyPidxx2Pid(x) (x ? (afs_int32)p_pid(x) : 0) #endif diff --git a/src/libadmin/test/client.c b/src/libadmin/test/client.c index 3d2cf61..2180d41 100644 --- a/src/libadmin/test/client.c +++ b/src/libadmin/test/client.c @@ -441,7 +441,7 @@ GetStatSourceFromString(const char *type, afs_stat_source_t * src, int *port) typedef enum { AFS_PEER_STATS, - AFS_PROCESS_STATS + afs_proc_tESS_STATS } afs_stat_type_t, *afs_stat_type_p; static afs_stat_type_t @@ -452,7 +452,7 @@ GetStatTypeFromString(const char *type) if (!strcmp(type, "peer")) { rc = AFS_PEER_STATS; } else if (!strcmp(type, "process")) { - rc = AFS_PROCESS_STATS; + rc = afs_proc_tESS_STATS; } else { ERR_EXT("stat_type must be process or peer"); }