From d19d6e6b458e551bcea54f2b5ed1015dc467182e Mon Sep 17 00:00:00 2001 From: phk Date: Sun, 21 Nov 1999 12:38:21 +0000 Subject: s/p_cred->pc_ucred/p_ucred/g --- sys/amd64/amd64/machdep.c | 2 +- sys/coda/coda_vfsops.c | 4 ++-- sys/compat/svr4/svr4_misc.c | 2 +- sys/fs/coda/coda_vfsops.c | 4 ++-- sys/fs/procfs/procfs.h | 2 +- sys/fs/procfs/procfs_mem.c | 2 +- sys/i386/i386/machdep.c | 2 +- sys/kern/imgact_aout.c | 2 +- sys/kern/imgact_elf.c | 2 +- sys/kern/kern_exit.c | 2 +- sys/kern/kern_sig.c | 2 +- sys/miscfs/devfs/devfs_tree.c | 4 ++-- sys/miscfs/procfs/procfs.h | 2 +- sys/miscfs/procfs/procfs_mem.c | 2 +- sys/pc98/i386/machdep.c | 2 +- sys/pc98/pc98/machdep.c | 2 +- sys/svr4/svr4_misc.c | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) (limited to 'sys') diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index aa8e179..2802272 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -2196,7 +2196,7 @@ set_dbregs(p, dbregs) * from within kernel mode? */ - if (p->p_cred->pc_ucred->cr_uid != 0) { + if (p->p_ucred->cr_uid != 0) { if (dbregs->dr7 & 0x3) { /* dr0 is enabled */ if (dbregs->dr0 >= VM_MAXUSER_ADDRESS) diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c index 229822a..615289c 100644 --- a/sys/coda/coda_vfsops.c +++ b/sys/coda/coda_vfsops.c @@ -315,7 +315,7 @@ coda_root(vfsp, vpp) } } - error = venus_root(vftomi(vfsp), p->p_cred->pc_ucred, p, &VFid); + error = venus_root(vftomi(vfsp), p->p_ucred, p, &VFid); if (!error) { /* @@ -454,7 +454,7 @@ coda_fhtovp(vfsp, fhp, nam, vpp, exflagsp, creadanonp) return(0); } - error = venus_fhtovp(vftomi(vfsp), &cfid->cfid_fid, p->p_cred->pc_ucred, p, &VFid, &vtype); + error = venus_fhtovp(vftomi(vfsp), &cfid->cfid_fid, p->p_ucred, p, &VFid, &vtype); if (error) { CODADEBUG(CODA_VGET, myprintf(("vget error %d\n",error));) diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index 2b39d6b..67bafae 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -1231,7 +1231,7 @@ loop: * Free up credentials. */ if (--q->p_cred->p_refcnt == 0) { - crfree(q->p_cred->pc_ucred); + crfree(q->p_ucred); FREE(q->p_cred, M_SUBPROC); } diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c index 229822a..615289c 100644 --- a/sys/fs/coda/coda_vfsops.c +++ b/sys/fs/coda/coda_vfsops.c @@ -315,7 +315,7 @@ coda_root(vfsp, vpp) } } - error = venus_root(vftomi(vfsp), p->p_cred->pc_ucred, p, &VFid); + error = venus_root(vftomi(vfsp), p->p_ucred, p, &VFid); if (!error) { /* @@ -454,7 +454,7 @@ coda_fhtovp(vfsp, fhp, nam, vpp, exflagsp, creadanonp) return(0); } - error = venus_fhtovp(vftomi(vfsp), &cfid->cfid_fid, p->p_cred->pc_ucred, p, &VFid, &vtype); + error = venus_fhtovp(vftomi(vfsp), &cfid->cfid_fid, p->p_ucred, p, &VFid, &vtype); if (error) { CODADEBUG(CODA_VGET, myprintf(("vget error %d\n",error));) diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h index f5547ee..bd6a554 100644 --- a/sys/fs/procfs/procfs.h +++ b/sys/fs/procfs/procfs.h @@ -97,7 +97,7 @@ struct pfsnode { #define CHECKIO(p1, p2) \ ((p1) == (p2) || \ (PRISON_CHECK(p1, p2) && \ - ((((p1)->p_cred->pc_ucred->cr_uid == (p2)->p_cred->p_ruid) && \ + ((((p1)->p_ucred->cr_uid == (p2)->p_cred->p_ruid) && \ ((p1)->p_cred->p_ruid == (p2)->p_cred->p_ruid) && \ ((p1)->p_cred->p_svuid == (p2)->p_cred->p_ruid) && \ ((p2)->p_flag & P_SUGID) == 0) || \ diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index 963fb3a..521bd5b 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -343,7 +343,7 @@ int procfs_kmemaccess(curp) int i; struct ucred *cred; - cred = curp->p_cred->pc_ucred; + cred = curp->p_ucred; if (suser(curp)) return 1; diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index aa8e179..2802272 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -2196,7 +2196,7 @@ set_dbregs(p, dbregs) * from within kernel mode? */ - if (p->p_cred->pc_ucred->cr_uid != 0) { + if (p->p_ucred->cr_uid != 0) { if (dbregs->dr7 & 0x3) { /* dr0 is enabled */ if (dbregs->dr0 >= VM_MAXUSER_ADDRESS) diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index eea280d..da640ad 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -247,7 +247,7 @@ aout_coredump(p, vp, limit) register struct vnode *vp; off_t limit; { - register struct ucred *cred = p->p_cred->pc_ucred; + register struct ucred *cred = p->p_ucred; register struct vmspace *vm = p->p_vmspace; int error; diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 84c4ac6..da938c5 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -688,7 +688,7 @@ elf_coredump(p, vp, limit) register struct vnode *vp; off_t limit; { - register struct ucred *cred = p->p_cred->pc_ucred; + register struct ucred *cred = p->p_ucred; int error = 0; struct sseg_closure seginfo; void *hdr; diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index abbe9de..7a2b5b3 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -480,7 +480,7 @@ loop: * Free up credentials. */ if (--p->p_cred->p_refcnt == 0) { - crfree(p->p_cred->pc_ucred); + crfree(p->p_ucred); FREE(p->p_cred, M_SUBPROC); p->p_cred = NULL; } diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index fa065e4..a7b6499 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1580,7 +1580,7 @@ coredump(p) register struct proc *p; { register struct vnode *vp; - register struct ucred *cred = p->p_cred->pc_ucred; + register struct ucred *cred = p->p_ucred; struct nameidata nd; struct vattr vattr; int error, error1; diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c index 2b97d6d..d47917a 100644 --- a/sys/miscfs/devfs/devfs_tree.c +++ b/sys/miscfs/devfs/devfs_tree.c @@ -1250,7 +1250,7 @@ devfs_open_device(char *path, int type) return (NULL); #if 0 - if ( VOP_OPEN(vn, FREAD, proc0.p_cred->pc_ucred, &proc0)) { + if ( VOP_OPEN(vn, FREAD, proc0.p_ucred, &proc0)) { vput(vn); return (NULL); } @@ -1268,7 +1268,7 @@ void devfs_close_device(struct vnode *vn) { #if 0 - VOP_CLOSE(vn, 0, proc0.p_cred->pc_ucred, &proc0) ; + VOP_CLOSE(vn, 0, proc0.p_ucred, &proc0) ; #endif vput(vn); } diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h index f5547ee..bd6a554 100644 --- a/sys/miscfs/procfs/procfs.h +++ b/sys/miscfs/procfs/procfs.h @@ -97,7 +97,7 @@ struct pfsnode { #define CHECKIO(p1, p2) \ ((p1) == (p2) || \ (PRISON_CHECK(p1, p2) && \ - ((((p1)->p_cred->pc_ucred->cr_uid == (p2)->p_cred->p_ruid) && \ + ((((p1)->p_ucred->cr_uid == (p2)->p_cred->p_ruid) && \ ((p1)->p_cred->p_ruid == (p2)->p_cred->p_ruid) && \ ((p1)->p_cred->p_svuid == (p2)->p_cred->p_ruid) && \ ((p2)->p_flag & P_SUGID) == 0) || \ diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c index 963fb3a..521bd5b 100644 --- a/sys/miscfs/procfs/procfs_mem.c +++ b/sys/miscfs/procfs/procfs_mem.c @@ -343,7 +343,7 @@ int procfs_kmemaccess(curp) int i; struct ucred *cred; - cred = curp->p_cred->pc_ucred; + cred = curp->p_ucred; if (suser(curp)) return 1; diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index c766ea6..e265322 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -2432,7 +2432,7 @@ set_dbregs(p, dbregs) * from within kernel mode? */ - if (p->p_cred->pc_ucred->cr_uid != 0) { + if (p->p_ucred->cr_uid != 0) { if (dbregs->dr7 & 0x3) { /* dr0 is enabled */ if (dbregs->dr0 >= VM_MAXUSER_ADDRESS) diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index c766ea6..e265322 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -2432,7 +2432,7 @@ set_dbregs(p, dbregs) * from within kernel mode? */ - if (p->p_cred->pc_ucred->cr_uid != 0) { + if (p->p_ucred->cr_uid != 0) { if (dbregs->dr7 & 0x3) { /* dr0 is enabled */ if (dbregs->dr0 >= VM_MAXUSER_ADDRESS) diff --git a/sys/svr4/svr4_misc.c b/sys/svr4/svr4_misc.c index 2b39d6b..67bafae 100644 --- a/sys/svr4/svr4_misc.c +++ b/sys/svr4/svr4_misc.c @@ -1231,7 +1231,7 @@ loop: * Free up credentials. */ if (--q->p_cred->p_refcnt == 0) { - crfree(q->p_cred->pc_ucred); + crfree(q->p_ucred); FREE(q->p_cred, M_SUBPROC); } -- cgit v1.1