From 7009f356cad3148eb799e907503760f31622ee44 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 29 Nov 2005 05:02:24 +0000 Subject: [PATCH] STABLE14-macos-103-update-20051128 roll up fixes for 10.3 (cherry picked from commit efeedc4ac12632c619d1d4d719beac22478e14cc) --- src/afs/DARWIN/osi_file.c | 2 +- src/afs/DARWIN/osi_groups.c | 9 ++++++++- src/afs/DARWIN/osi_vfsops.c | 6 +++--- src/afs/DARWIN/osi_vnodeops.c | 12 ++++++++++-- src/config/param.ppc_darwin_70.h | 3 ++- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c index 9b05020e1..eef0f27e8 100644 --- a/src/afs/DARWIN/osi_file.c +++ b/src/afs/DARWIN/osi_file.c @@ -116,7 +116,7 @@ VnodeToDev(vnode_t * avp) return ip->i_dev; } else if (afs_CacheFSType == AFS_APPL_HFS_CACHE) { #endif -#if defined(AFS_DARWIN80_ENV) || !defined(VTOH) +#if defined(AFS_DARWIN80_ENV) struct vattr va; VATTR_INIT(&va); VATTR_WANTED(&va, va_fsid); diff --git a/src/afs/DARWIN/osi_groups.c b/src/afs/DARWIN/osi_groups.c index 8ae9b2ad6..0542c2785 100644 --- a/src/afs/DARWIN/osi_groups.c +++ b/src/afs/DARWIN/osi_groups.c @@ -86,7 +86,14 @@ Afs_xsetgroups(p, args, retval) return code; } - +int +setpag(proc, cred, pagvalue, newpag, change_parent) + struct proc *proc; + struct ucred **cred; + afs_uint32 pagvalue; + afs_uint32 *newpag; + afs_uint32 change_parent; +{ gid_t gidset[NGROUPS]; int ngroups, code; int j; diff --git a/src/afs/DARWIN/osi_vfsops.c b/src/afs/DARWIN/osi_vfsops.c index ed34e60af..d6288b6de 100644 --- a/src/afs/DARWIN/osi_vfsops.c +++ b/src/afs/DARWIN/osi_vfsops.c @@ -84,7 +84,7 @@ afs_mount(mp, devvp, data, ctx) vfs_context_t ctx; #else int -afs_mount(mp, path, data, ndp, p) +afs_mount(mp, path, data, ndp, ctx) register struct mount *mp; char *path; caddr_t data; @@ -252,10 +252,10 @@ afs_root(struct mount *mp, struct vnode **vpp) #else struct proc *p = current_proc(); struct ucred _cr; - struct ucred *cr =&_cr; + struct ucred *cr = &_cr; pcred_readlock(p); - cr = *p->p_cred->pc_ucred; + _cr = *p->p_cred->pc_ucred; pcred_unlock(p); #endif AFS_GLOCK(); diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c index 307ece30f..a889ba2cb 100644 --- a/src/afs/DARWIN/osi_vnodeops.c +++ b/src/afs/DARWIN/osi_vnodeops.c @@ -1620,8 +1620,16 @@ afs_vop_reclaim(ap) AFS_GLOCK(); ObtainWriteLock(&afs_xvcache, 335); error = afs_FlushVCache(tvc, &sl); /* toss our stuff from vnode */ - if (tvc->states & (CVInit | CDeadVnode)) { - tvc->states &= ~(CVInit | CDeadVnode); + if (tvc->states & (CVInit +#ifdef AFS_DARWIN80_ENV + | CDeadVnode +#endif + )) { + tvc->states &= ~(CVInit +#ifdef AFS_DARWIN80_ENV + | CDeadVnode +#endif + ); afs_osi_Wakeup(&tvc->states); } ReleaseWriteLock(&afs_xvcache); diff --git a/src/config/param.ppc_darwin_70.h b/src/config/param.ppc_darwin_70.h index 7a2d62dd5..b07eb3215 100644 --- a/src/config/param.ppc_darwin_70.h +++ b/src/config/param.ppc_darwin_70.h @@ -64,7 +64,8 @@ #define va_nodeid va_fileid #define vfs_vnodecovered mnt_vnodecovered #define direct dirent -#define vnode_t struct vnode +#define vnode_t struct vnode * +#define mount_t struct mount * //#define VN_RELE(vp) vrele(((struct vnode *)(vp))) //#define VN_HOLD(vp) VREF(((struct vnode *)(vp))) -- 2.39.5