From dbcc94be36eb7e16660d9d09b9885c37b7e22d1d Mon Sep 17 00:00:00 2001 From: jamie Date: Sat, 13 Jun 2009 15:35:22 +0000 Subject: [PATCH] Use getcredhostuuid instead of accessing the prison directly. Approved by: bz (mentor) --- sys/fs/nfsclient/nfs_clstate.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 8cc2ce2aeab2..a56432523dfc 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -676,16 +676,12 @@ nfscl_getcl(vnode_t vp, struct ucred *cred, NFSPROC_T *p, struct nfsclclient *newclp = NULL; struct nfscllockowner *lp, *nlp; struct nfsmount *nmp = VFSTONFS(vnode_mount(vp)); - struct prison *pr; char uuid[HOSTUUIDLEN]; int igotlock = 0, error, trystalecnt, clidinusedelay, i; u_int16_t idlen = 0; if (cred != NULL) { - pr = cred->cr_prison; - mtx_lock(&pr->pr_mtx); - strlcpy(uuid, pr->pr_uuid, sizeof uuid); - mtx_unlock(&pr->pr_mtx); + getcredhostuuid(cred, uuid, sizeof uuid); idlen = strlen(uuid); if (idlen > 0) idlen += sizeof (u_int64_t);