From 54c4ce48bf4883ee4f1cb8db8899d754baef9c34 Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Wed, 30 Dec 2009 19:19:09 -0500 Subject: [PATCH] freebsd: fix afs_root signature (RELENG_8) Track removal of thread id param, which had become redundant. Change-Id: Ifa8ddce411373a1aee01b577bf7e5a268e644dd7 Reviewed-on: http://gerrit.openafs.org/1055 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/FBSD/osi_vfsops.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c index 37c6437633..6ae76a65a0 100644 --- a/src/afs/FBSD/osi_vfsops.c +++ b/src/afs/FBSD/osi_vfsops.c @@ -164,7 +164,9 @@ afs_unmount(struct mount *mp, int flags, THREAD_OR_PROC) } int -#if defined(AFS_FBSD60_ENV) +#if defined(AFS_FBSD80_ENV) +afs_root(struct mount *mp, int flags, struct vnode **vpp) +#elif defined(AFS_FBSD60_ENV) afs_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td) #elif defined(AFS_FBSD53_ENV) afs_root(struct mount *mp, struct vnode **vpp, struct thread *td) @@ -176,10 +178,10 @@ afs_root(struct mount *mp, struct vnode **vpp) struct vrequest treq; register struct vcache *tvp = 0; #ifdef AFS_FBSD50_ENV -#ifndef AFS_FBSD53_ENV +#if !defined(AFS_FBSD53_ENV) || defined(AFS_FBSD80_ENV) struct thread *td = curthread; #endif - struct ucred *cr = td->td_ucred; + struct ucred *cr = osi_curcred(); #else struct proc *p = curproc; struct ucred *cr = p->p_cred->pc_ucred;