Simple p_ucred -> td_ucred changes to start using the per-thread ucred

reference.

3 files changed, 7 insertions, 8 deletions

diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index 12c956c..394b1d5 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -260,10 +260,10 @@ fd_revoke(td, fd)
 		goto out;
 	}
 
-	if ((error = VOP_GETATTR(vp, &vattr, td->td_proc->p_ucred, td)) != 0)
+	if ((error = VOP_GETATTR(vp, &vattr, td->td_ucred, td)) != 0)
 		goto out;
 
-	if (td->td_proc->p_ucred->cr_uid != vattr.va_uid &&
+	if (td->td_ucred->cr_uid != vattr.va_uid &&
 	    (error = suser_td(td)) != 0)
 		goto out;
 
@@ -306,7 +306,7 @@ fd_truncate(td, fd, flp)
 		return ESPIPE;
 	}
 
-	if ((error = VOP_GETATTR(vp, &vattr, td->td_proc->p_ucred, td)) != 0) {
+	if ((error = VOP_GETATTR(vp, &vattr, td->td_ucred, td)) != 0) {
 		fdrop(fp, td);
 		return error;
 	}
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 9dcfa7f..40a12c6 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -275,7 +275,7 @@ svr4_sys_getdents64(td, uap)
 		return (EINVAL);
 	}
 
-	if ((error = VOP_GETATTR(vp, &va, td->td_proc->p_ucred, td))) {
+	if ((error = VOP_GETATTR(vp, &va, td->td_ucred, td))) {
 		fdrop(fp, td);
 		return error;
 	}
@@ -616,7 +616,7 @@ svr4_sys_fchroot(td, uap)
 	if (vp->v_type != VDIR)
 		error = ENOTDIR;
 	else
-		error = VOP_ACCESS(vp, VEXEC, td->td_proc->p_ucred, td);
+		error = VOP_ACCESS(vp, VEXEC, td->td_ucred, td);
 	VOP_UNLOCK(vp, 0, td);
 	if (error) {
 		fdrop(fp, td);
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index 39aa904..5292a8c 100644
--- a/sys/compat/svr4/svr4_sysvec.c
+++ b/sys/compat/svr4/svr4_sysvec.c
@@ -246,7 +246,6 @@ svr4_emul_find(td, sgp, prefix, path, pbuf, cflag)
 	char		**pbuf;
 	int		  cflag;
 {
-	struct proc	 	*p = td->td_proc;
 	struct nameidata	 nd;
 	struct nameidata	 ndroot;
 	struct vattr		 vat;
@@ -331,11 +330,11 @@ svr4_emul_find(td, sgp, prefix, path, pbuf, cflag)
 		}
 		NDFREE(&ndroot, NDF_ONLY_PNBUF);
 
-		if ((error = VOP_GETATTR(nd.ni_vp, &vat, p->p_ucred, td)) != 0) {
+		if ((error = VOP_GETATTR(nd.ni_vp, &vat, td->td_ucred, td)) != 0) {
 			goto done;
 		}
 
-		if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, p->p_ucred, td))
+		if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, td->td_ucred, td))
 		    != 0) {
 			goto done;
 		}