From 3cd54ac636d38fb45ea957382c669e8b5d2df8cc Mon Sep 17 00:00:00 2001 From: Jim Rees Date: Mon, 23 Jun 2003 23:14:06 +0000 Subject: [PATCH] setpag-proto-20030623 use prototype for setpag for freebsd too --- src/afs/FBSD/osi_groups.c | 8 ++------ src/afs/afs_pioctl.c | 4 +--- src/afs/afs_prototypes.h | 13 +++++++------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/afs/FBSD/osi_groups.c b/src/afs/FBSD/osi_groups.c index 9a8984ad8..a18da3d5c 100644 --- a/src/afs/FBSD/osi_groups.c +++ b/src/afs/FBSD/osi_groups.c @@ -128,12 +128,8 @@ Afs_xsetgroups(p, args, retval) int -setpag(proc, cred, pagvalue, newpag, change_parent) - struct proc *proc; - struct ucred **cred; - afs_uint32 pagvalue; - afs_uint32 *newpag; - afs_uint32 change_parent; +setpag(struct proc *proc, struct ucred **cred, afs_uint32 pagvalue, + afs_uint32 *newpag, int change_parent) { gid_t gidset[NGROUPS]; int ngroups, code; diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index f891a16c5..b9b9395a8 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -805,9 +805,7 @@ afs_syscall_pioctl(path, com, cmarg, follow) int follow; { struct afs_ioctl data; -#ifdef AFS_NEED_CLIENTCONTEXT struct AFS_UCRED *tmpcred, *foreigncreds = NULL; -#endif register afs_int32 code = 0; struct vnode *vp; #ifdef AFS_DEC_ENV @@ -884,7 +882,7 @@ afs_syscall_pioctl(path, com, cmarg, follow) if ((com & 0xff) == 15) { /* special case prefetch so entire pathname eval occurs in helper process. otherwise, the pioctl call is essentially useless */ -#if defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_LINUX22_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_SUN5_ENV) || defined(AFS_AIX41_ENV) || defined(AFS_LINUX22_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) code = Prefetch(path, &data, follow, foreigncreds ? foreigncreds : credp); #else diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h index 4a221b1af..d8f108865 100644 --- a/src/afs/afs_prototypes.h +++ b/src/afs/afs_prototypes.h @@ -467,12 +467,6 @@ extern int setpag(cred_t **cr, afs_uint32 pagvalue, afs_uint32 *newpag, int chan #endif -/* OBSD/osi_misc.c */ -#ifdef AFS_OBSD_ENV -extern int setpag(struct proc *proc, struct ucred **cred, afs_uint32 pagvalue, - afs_uint32 *newpag, int change_parent); -#endif - /* ARCH/osi_sleep.c */ extern void afs_osi_InitWaitHandle(struct afs_osi_WaitHandle *achandle); extern void afs_osi_CancelWait(struct afs_osi_WaitHandle *achandle); @@ -511,6 +505,13 @@ extern int afs_osi_MapStrategy(int (*aproc)(struct buf *bp), register struct buf extern void shutdown_osifile(void); +/* ARCH/osi_groups.c */ +#ifdef AFS_XBSD_ENV +extern int setpag(struct proc *proc, struct ucred **cred, afs_uint32 pagvalue, + afs_uint32 *newpag, int change_parent); +#endif + + /* ARCH/osi_vm.c */ extern int osi_VM_FlushVCache(struct vcache *avc, int *slept); extern void osi_VM_StoreAllSegments(struct vcache *avc); -- 2.39.5