Subject: vn_rdwr/uiomove and UIO_SYSSPACE
To: None <tech-kern@netbsd.org>
From: Nick Hudson <skrll@netbsd.org>
List: tech-kern
Date: 09/16/2004 20:57:32
--Boundary-00=_sAfSBmzLv5nIrzW
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
While working on the ktrace-lwp branch I noticed that vn_rdwr(9) and
uiomove(9) are called with UIO_SYSSPACE and a non-NULL proc arg. This is not
necessary.
Does anyone mind if I commit the following?
Nick
--Boundary-00=_sAfSBmzLv5nIrzW
Content-Type: text/x-diff;
charset="us-ascii";
name="UIO_SYSSPACE.diffs"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="UIO_SYSSPACE.diffs"
Index: arch/alpha/alpha/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/vm_machdep.c,v
retrieving revision 1.83
diff -u -p -r1.83 vm_machdep.c
--- arch/alpha/alpha/vm_machdep.c 28 Aug 2004 22:12:40 -0000 1.83
+++ arch/alpha/alpha/vm_machdep.c 16 Sep 2004 19:53:51 -0000
@@ -58,7 +58,6 @@ cpu_coredump(struct lwp *l, struct vnode
int error;
struct md_coredump cpustate;
struct coreseg cseg;
- struct proc *p = l->l_proc;
CORE_SETMAGIC(*chdr, COREMAGIC, MID_MACHINE, 0);
chdr->c_hdrsize = ALIGN(sizeof(*chdr));
@@ -80,13 +79,13 @@ cpu_coredump(struct lwp *l, struct vnode
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cpustate, sizeof(cpustate),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (!error)
chdr->c_nseg++;
Index: arch/amd64/amd64/autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/autoconf.c,v
retrieving revision 1.7
diff -u -p -r1.7 autoconf.c
--- arch/amd64/amd64/autoconf.c 30 Dec 2003 12:33:15 -0000 1.7
+++ arch/amd64/amd64/autoconf.c 16 Sep 2004 19:53:52 -0000
@@ -219,7 +219,7 @@ matchbiosdisks()
continue;
}
error = vn_rdwr(UIO_READ, tv, mbr, DEV_BSIZE, 0,
- UIO_SYSSPACE, 0, NOCRED, NULL, 0);
+ UIO_SYSSPACE, 0, NOCRED, NULL, NULL);
VOP_CLOSE(tv, FREAD, NOCRED, 0);
if (error) {
#ifdef GEOM_DEBUG
Index: arch/amd64/amd64/netbsd32_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/netbsd32_machdep.c,v
retrieving revision 1.10
diff -u -p -r1.10 netbsd32_machdep.c
--- arch/amd64/amd64/netbsd32_machdep.c 25 Mar 2004 15:32:27 -0000 1.10
+++ arch/amd64/amd64/netbsd32_machdep.c 16 Sep 2004 19:53:53 -0000
@@ -420,7 +420,6 @@ int
cpu_coredump32(struct lwp *l, struct vnode *vp, struct ucred *cred,
struct core32 *chdr)
{
- struct proc *p = l->l_proc;
struct md_core32 md_core;
struct coreseg cseg;
int error;
@@ -446,13 +445,13 @@ cpu_coredump32(struct lwp *l, struct vno
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred,
- NULL, p);
+ NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof(md_core),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
Index: arch/amd64/amd64/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/vm_machdep.c,v
retrieving revision 1.8
diff -u -p -r1.8 vm_machdep.c
--- arch/amd64/amd64/vm_machdep.c 28 Aug 2004 22:12:40 -0000 1.8
+++ arch/amd64/amd64/vm_machdep.c 16 Sep 2004 19:53:54 -0000
@@ -291,7 +291,6 @@ cpu_coredump(l, vp, cred, chdr)
struct ucred *cred;
struct core *chdr;
{
- struct proc *p = l->l_proc;
struct md_core md_core;
struct coreseg cseg;
int error;
@@ -317,13 +316,13 @@ cpu_coredump(l, vp, cred, chdr)
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred,
- NULL, p);
+ NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof(md_core),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
Index: arch/arm/arm/vm_machdep_arm.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm/vm_machdep_arm.c,v
retrieving revision 1.7
diff -u -p -r1.7 vm_machdep_arm.c
--- arch/arm/arm/vm_machdep_arm.c 29 Jun 2003 22:28:08 -0000 1.7
+++ arch/arm/arm/vm_machdep_arm.c 16 Sep 2004 19:53:56 -0000
@@ -58,7 +58,6 @@ int
cpu_coredump(struct lwp *l, struct vnode *vp, struct ucred *cred,
struct core *chdr)
{
- struct proc *p = l->l_proc;
int error;
struct {
struct reg regs;
@@ -86,13 +85,13 @@ cpu_coredump(struct lwp *l, struct vnode
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cpustate, sizeof(cpustate),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
Index: arch/hppa/hppa/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hppa/hppa/vm_machdep.c,v
retrieving revision 1.13
diff -u -p -r1.13 vm_machdep.c
--- arch/hppa/hppa/vm_machdep.c 28 Aug 2004 22:12:40 -0000 1.13
+++ arch/hppa/hppa/vm_machdep.c 16 Sep 2004 19:54:06 -0000
@@ -63,7 +63,6 @@ int
cpu_coredump(struct lwp *l, struct vnode *vp, struct ucred *cred,
struct core *core)
{
- struct proc *p = l->l_proc;
struct md_coredump md_core;
struct coreseg cseg;
off_t off;
@@ -81,7 +80,7 @@ cpu_coredump(struct lwp *l, struct vnode
cseg.c_size = core->c_cpusize;
#define write(vp, addr, n) vn_rdwr(UIO_WRITE, (vp), (caddr_t)(addr), (n), off, \
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, NULL, p)
+ UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, NULL, NULL)
off = core->c_hdrsize;
if ((error = write(vp, &cseg, core->c_seghdrsize)))
Index: arch/i386/i386/autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/autoconf.c,v
retrieving revision 1.77
diff -u -p -r1.77 autoconf.c
--- arch/i386/i386/autoconf.c 5 Aug 2004 18:04:35 -0000 1.77
+++ arch/i386/i386/autoconf.c 16 Sep 2004 19:54:06 -0000
@@ -254,7 +254,7 @@ matchbiosdisks(void)
continue;
}
error = vn_rdwr(UIO_READ, tv, mbr, DEV_BSIZE, 0,
- UIO_SYSSPACE, 0, NOCRED, NULL, 0);
+ UIO_SYSSPACE, 0, NOCRED, NULL, NULL);
VOP_CLOSE(tv, FREAD, NOCRED, 0);
if (error) {
#ifdef GEOM_DEBUG
Index: arch/i386/i386/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/vm_machdep.c,v
retrieving revision 1.117
diff -u -p -r1.117 vm_machdep.c
--- arch/i386/i386/vm_machdep.c 28 Aug 2004 22:12:40 -0000 1.117
+++ arch/i386/i386/vm_machdep.c 16 Sep 2004 19:54:07 -0000
@@ -277,7 +277,6 @@ int
cpu_coredump(struct lwp *l, struct vnode *vp, struct ucred *cred,
struct core *chdr)
{
- struct proc *p = l->l_proc;
struct md_core md_core;
struct coreseg cseg;
int error;
@@ -303,13 +302,13 @@ cpu_coredump(struct lwp *l, struct vnode
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred,
- NULL, p);
+ NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof(md_core),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
Index: arch/m68k/m68k/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/m68k/m68k/vm_machdep.c,v
retrieving revision 1.9
diff -u -p -r1.9 vm_machdep.c
--- arch/m68k/m68k/vm_machdep.c 28 Aug 2004 22:12:41 -0000 1.9
+++ arch/m68k/m68k/vm_machdep.c 16 Sep 2004 19:54:08 -0000
@@ -211,7 +211,6 @@ int
cpu_coredump(struct lwp *l, struct vnode *vp, struct ucred *cred,
struct core *chdr)
{
- struct proc *p = l->l_proc;
struct md_core md_core;
struct coreseg cseg;
int error;
@@ -242,13 +241,13 @@ cpu_coredump(struct lwp *l, struct vnode
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred,
- NULL, p);
+ NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof(md_core),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
Index: arch/mips/mips/cpu_exec.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/mips/cpu_exec.c,v
retrieving revision 1.45
diff -u -p -r1.45 cpu_exec.c
--- arch/mips/mips/cpu_exec.c 26 Nov 2003 08:36:49 -0000 1.45
+++ arch/mips/mips/cpu_exec.c 16 Sep 2004 19:54:10 -0000
@@ -211,7 +211,7 @@ mips_elf_makecmds (p, epp)
if ((error = vn_rdwr(UIO_READ, epp->ep_vp, (caddr_t)&ph,
sizeof ph, ex->e_phoff + i * sizeof ph,
UIO_SYSSPACE, IO_NODELOCKED,
- p->p_ucred, &resid, p))
+ p->p_ucred, &resid, NULL))
!= 0)
return error;
Index: arch/mips/mips/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/mips/vm_machdep.c,v
retrieving revision 1.103
diff -u -p -r1.103 vm_machdep.c
--- arch/mips/mips/vm_machdep.c 28 Aug 2004 22:12:41 -0000 1.103
+++ arch/mips/mips/vm_machdep.c 16 Sep 2004 19:54:10 -0000
@@ -275,7 +275,6 @@ cpu_coredump(struct lwp *l, struct vnode
struct frame frame;
struct fpreg fpregs;
} cpustate;
- struct proc *p = l->l_proc;
CORE_SETMAGIC(*chdr, COREMAGIC, MID_MACHINE, 0);
chdr->c_hdrsize = ALIGN(sizeof(struct core));
@@ -292,7 +291,7 @@ cpu_coredump(struct lwp *l, struct vnode
cseg.c_size = chdr->c_cpusize;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
@@ -300,7 +299,7 @@ cpu_coredump(struct lwp *l, struct vnode
(off_t)chdr->c_cpusize,
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize),
UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT,
- cred, NULL, p);
+ cred, NULL, NULL);
if (!error)
chdr->c_nseg++;
Index: arch/pc532/pc532/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/pc532/pc532/vm_machdep.c,v
retrieving revision 1.61
diff -u -p -r1.61 vm_machdep.c
--- arch/pc532/pc532/vm_machdep.c 28 Aug 2004 22:12:41 -0000 1.61
+++ arch/pc532/pc532/vm_machdep.c 16 Sep 2004 19:54:12 -0000
@@ -267,7 +267,6 @@ cpu_coredump(l, vp, cred, chdr)
struct ucred *cred;
struct core *chdr;
{
- struct proc *p = l->l_proc;
struct md_core md_core;
struct coreseg cseg;
int error;
@@ -293,13 +292,13 @@ cpu_coredump(l, vp, cred, chdr)
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred,
- NULL, p);
+ NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof(md_core),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
Index: arch/powerpc/powerpc/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/powerpc/vm_machdep.c,v
retrieving revision 1.61
diff -u -p -r1.61 vm_machdep.c
--- arch/powerpc/powerpc/vm_machdep.c 28 Aug 2004 22:12:41 -0000 1.61
+++ arch/powerpc/powerpc/vm_machdep.c 16 Sep 2004 19:54:14 -0000
@@ -243,7 +243,6 @@ cpu_coredump(struct lwp *l, struct vnode
{
struct coreseg cseg;
struct md_coredump md_core;
- struct proc *p = l->l_proc;
struct pcb *pcb = &l->l_addr->u_pcb;
int error;
@@ -277,11 +276,11 @@ cpu_coredump(struct lwp *l, struct vnode
if ((error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p)) != 0)
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL)) != 0)
return error;
if ((error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof md_core,
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p)) != 0)
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL)) != 0)
return error;
chdr->c_nseg++;
Index: arch/sh3/sh3/coff_exec.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sh3/sh3/coff_exec.c,v
retrieving revision 1.21
diff -u -p -r1.21 coff_exec.c
--- arch/sh3/sh3/coff_exec.c 11 Aug 2003 12:58:43 -0000 1.21
+++ arch/sh3/sh3/coff_exec.c 16 Sep 2004 19:54:15 -0000
@@ -198,7 +198,7 @@ coff_find_section(struct proc *p, struct
siz = sizeof(struct coff_scnhdr);
error = vn_rdwr(UIO_READ, vp, (caddr_t) sh,
siz, pos, UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred,
- &resid, p);
+ &resid, NULL);
if (error) {
DPRINTF(("section hdr %d read error %d\n", i, error));
return error;
@@ -335,7 +335,7 @@ exec_coff_prep_zmagic(struct proc *p, st
error = vn_rdwr(UIO_READ, epp->ep_vp, (caddr_t) buf,
len, sh.s_scnptr,
UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred,
- &resid, p);
+ &resid, NULL);
if (error) {
DPRINTF(("shlib section read error %d\n", error));
return ENOEXEC;
@@ -397,7 +397,7 @@ coff_load_shlib(struct proc *p, char *pa
siz = sizeof(struct coff_filehdr);
error = vn_rdwr(UIO_READ, nd.ni_vp, (caddr_t) fhp, siz, 0,
- UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred, &resid, p);
+ UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred, &resid, NULL);
if (error) {
DPRINTF(("filehdr read error %d\n", error));
vrele(nd.ni_vp);
Index: arch/sh3/sh3/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sh3/sh3/vm_machdep.c,v
retrieving revision 1.44
diff -u -p -r1.44 vm_machdep.c
--- arch/sh3/sh3/vm_machdep.c 28 Aug 2004 22:12:41 -0000 1.44
+++ arch/sh3/sh3/vm_machdep.c 16 Sep 2004 19:54:16 -0000
@@ -341,13 +341,13 @@ cpu_coredump(struct lwp *l, struct vnode
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred,
- (int *)0, l->l_proc);
+ (int *)0, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof(md_core),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, (int *)0, l->l_proc);
+ IO_NODELOCKED|IO_UNIT, cred, (int *)0, NULL);
if (error)
return error;
Index: arch/sh5/sh5/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sh5/sh5/vm_machdep.c,v
retrieving revision 1.9
diff -u -p -r1.9 vm_machdep.c
--- arch/sh5/sh5/vm_machdep.c 28 Aug 2004 22:12:41 -0000 1.9
+++ arch/sh5/sh5/vm_machdep.c 16 Sep 2004 19:54:16 -0000
@@ -118,13 +118,13 @@ cpu_coredump(struct lwp *l, struct vnode
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred,
- NULL, p);
+ NULL, NULL);
if (error)
return (error);
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof(md_core),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return (error);
Index: arch/sparc/sparc/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/vm_machdep.c,v
retrieving revision 1.80
diff -u -p -r1.80 vm_machdep.c
--- arch/sparc/sparc/vm_machdep.c 28 Aug 2004 22:12:41 -0000 1.80
+++ arch/sparc/sparc/vm_machdep.c 16 Sep 2004 19:54:17 -0000
@@ -371,13 +371,13 @@ cpu_coredump(l, vp, cred, chdr)
cseg.c_size = chdr->c_cpusize;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof(md_core),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (!error)
chdr->c_nseg++;
Index: arch/sparc64/sparc64/netbsd32_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/netbsd32_machdep.c,v
retrieving revision 1.42
diff -u -p -r1.42 netbsd32_machdep.c
--- arch/sparc64/sparc64/netbsd32_machdep.c 15 Jan 2004 14:37:31 -0000 1.42
+++ arch/sparc64/sparc64/netbsd32_machdep.c 16 Sep 2004 19:54:19 -0000
@@ -617,7 +617,6 @@ cpu_coredump32(l, vp, cred, chdr)
int i, error;
struct md_coredump32 md_core;
struct coreseg32 cseg;
- struct proc *p = l->l_proc;
CORE_SETMAGIC(*chdr, COREMAGIC, MID_MACHINE, 0);
chdr->c_hdrsize = ALIGN(sizeof(*chdr));
@@ -658,13 +657,13 @@ cpu_coredump32(l, vp, cred, chdr)
cseg.c_size = chdr->c_cpusize;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof(md_core),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (!error)
chdr->c_nseg++;
Index: arch/sparc64/sparc64/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/vm_machdep.c,v
retrieving revision 1.56
diff -u -p -r1.56 vm_machdep.c
--- arch/sparc64/sparc64/vm_machdep.c 28 Aug 2004 22:12:42 -0000 1.56
+++ arch/sparc64/sparc64/vm_machdep.c 16 Sep 2004 19:54:20 -0000
@@ -404,13 +404,13 @@ cpu_coredump(l, vp, cred, chdr)
cseg.c_size = chdr->c_cpusize;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, l->l_proc);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof(md_core),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, l->l_proc);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (!error)
chdr->c_nseg++;
Index: arch/vax/vax/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/vax/vax/vm_machdep.c,v
retrieving revision 1.84
diff -u -p -r1.84 vm_machdep.c
--- arch/vax/vax/vm_machdep.c 28 Aug 2004 22:12:42 -0000 1.84
+++ arch/vax/vax/vm_machdep.c 16 Sep 2004 19:54:21 -0000
@@ -238,7 +238,6 @@ cpu_coredump(l, vp, cred, chdr)
struct ucred *cred;
struct core *chdr;
{
- struct proc *p = l->l_proc;
struct trapframe *tf;
struct md_coredump state;
struct coreseg cseg;
@@ -258,13 +257,13 @@ cpu_coredump(l, vp, cred, chdr)
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
(off_t)chdr->c_hdrsize, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return error;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&state, sizeof(state),
(off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (!error)
chdr->c_nseg++;
Index: arch/xen/i386/autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/xen/i386/autoconf.c,v
retrieving revision 1.5
diff -u -p -r1.5 autoconf.c
--- arch/xen/i386/autoconf.c 25 Apr 2004 14:40:02 -0000 1.5
+++ arch/xen/i386/autoconf.c 16 Sep 2004 19:54:22 -0000
@@ -274,7 +274,7 @@ matchbiosdisks(void)
continue;
}
error = vn_rdwr(UIO_READ, tv, mbr, DEV_BSIZE, 0,
- UIO_SYSSPACE, 0, NOCRED, NULL, 0);
+ UIO_SYSSPACE, 0, NOCRED, NULL, NULL);
VOP_CLOSE(tv, FREAD, NOCRED, 0);
if (error) {
#ifdef GEOM_DEBUG
Index: coda/coda_vfsops.c
===================================================================
RCS file: /cvsroot/src/sys/coda/coda_vfsops.c,v
retrieving revision 1.38
diff -u -p -r1.38 coda_vfsops.c
--- coda/coda_vfsops.c 25 May 2004 14:54:56 -0000 1.38
+++ coda/coda_vfsops.c 16 Sep 2004 19:54:22 -0000
@@ -269,7 +269,7 @@ coda_mount(vfsp, path, data, ndp, p)
MARK_INT_SAT(CODA_MOUNT_STATS);
return set_statvfs_info("/coda", UIO_SYSSPACE, "CODA", UIO_SYSSPACE, vfsp,
- p);
+ NULL);
}
int
Index: compat/darwin/darwin_iohidsystem.c
===================================================================
RCS file: /cvsroot/src/sys/compat/darwin/darwin_iohidsystem.c,v
retrieving revision 1.25
diff -u -p -r1.25 darwin_iohidsystem.c
--- compat/darwin/darwin_iohidsystem.c 9 Dec 2003 17:13:19 -0000 1.25
+++ compat/darwin/darwin_iohidsystem.c 16 Sep 2004 19:54:23 -0000
@@ -477,7 +477,7 @@ darwin_iohidsystem_thread(args)
auio.uio_offset = 0;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_rw = UIO_READ;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
if ((error = (wsmux->d_read)(dev, &auio, 0)) != 0) {
#ifdef DEBUG_DARWIN
Index: compat/ibcs2/ibcs2_exec_coff.c
===================================================================
RCS file: /cvsroot/src/sys/compat/ibcs2/ibcs2_exec_coff.c,v
retrieving revision 1.11
diff -u -p -r1.11 ibcs2_exec_coff.c
--- compat/ibcs2/ibcs2_exec_coff.c 19 Nov 2003 15:46:16 -0000 1.11
+++ compat/ibcs2/ibcs2_exec_coff.c 16 Sep 2004 19:54:24 -0000
@@ -333,7 +333,7 @@ coff_find_section(p, vp, fp, sh, s_type)
siz = sizeof(struct coff_scnhdr);
error = vn_rdwr(UIO_READ, vp, (caddr_t) sh,
siz, pos, UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred,
- &resid, p);
+ &resid, NULL);
if (error) {
DPRINTF(("section hdr %d read error %d\n", i, error));
return error;
@@ -461,7 +461,7 @@ exec_ibcs2_coff_prep_zmagic(p, epp, fp,
error = vn_rdwr(UIO_READ, epp->ep_vp, (caddr_t) buf,
len, sh.s_scnptr,
UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred,
- &resid, p);
+ &resid, NULL);
if (error) {
DPRINTF(("shlib section read error %d\n", error));
free(buf, M_TEMP);
Index: compat/ibcs2/ibcs2_exec_xout.c
===================================================================
RCS file: /cvsroot/src/sys/compat/ibcs2/ibcs2_exec_xout.c,v
retrieving revision 1.8
diff -u -p -r1.8 ibcs2_exec_xout.c
--- compat/ibcs2/ibcs2_exec_xout.c 19 Nov 2003 15:46:16 -0000 1.8
+++ compat/ibcs2/ibcs2_exec_xout.c 16 Sep 2004 19:54:24 -0000
@@ -125,7 +125,7 @@ exec_ibcs2_xout_prep_nmagic(p, epp, xp,
error = vn_rdwr(UIO_READ, epp->ep_vp, (caddr_t)xs,
segsize, xep->xe_segpos,
UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred,
- &resid, p);
+ &resid, NULL);
if (error) {
DPRINTF(("segment table read error %d\n", error));
free(xs, M_TEMP);
Index: compat/ibcs2/ibcs2_misc.c
===================================================================
RCS file: /cvsroot/src/sys/compat/ibcs2/ibcs2_misc.c,v
retrieving revision 1.69
diff -u -p -r1.69 ibcs2_misc.c
--- compat/ibcs2/ibcs2_misc.c 9 Mar 2004 03:18:03 -0000 1.69
+++ compat/ibcs2/ibcs2_misc.c 16 Sep 2004 19:54:26 -0000
@@ -446,7 +446,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
@@ -579,7 +579,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
Index: compat/irix/irix_dirent.c
===================================================================
RCS file: /cvsroot/src/sys/compat/irix/irix_dirent.c,v
retrieving revision 1.11
diff -u -p -r1.11 irix_dirent.c
--- compat/irix/irix_dirent.c 29 Jun 2003 22:29:22 -0000 1.11
+++ compat/irix/irix_dirent.c 16 Sep 2004 19:54:26 -0000
@@ -124,7 +124,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
@@ -281,7 +281,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
Index: compat/linux/common/linux_file64.c
===================================================================
RCS file: /cvsroot/src/sys/compat/linux/common/linux_file64.c,v
retrieving revision 1.22
diff -u -p -r1.22 linux_file64.c
--- compat/linux/common/linux_file64.c 10 Aug 2003 20:16:27 -0000 1.22
+++ compat/linux/common/linux_file64.c 16 Sep 2004 19:54:27 -0000
@@ -449,7 +449,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
Index: compat/linux/common/linux_misc.c
===================================================================
RCS file: /cvsroot/src/sys/compat/linux/common/linux_misc.c,v
retrieving revision 1.129
diff -u -p -r1.129 linux_misc.c
--- compat/linux/common/linux_misc.c 13 Sep 2004 20:09:44 -0000 1.129
+++ compat/linux/common/linux_misc.c 16 Sep 2004 19:54:29 -0000
@@ -808,7 +808,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
Index: compat/linux/common/linux_uselib.c
===================================================================
RCS file: /cvsroot/src/sys/compat/linux/common/linux_uselib.c,v
retrieving revision 1.12
diff -u -p -r1.12 linux_uselib.c
--- compat/linux/common/linux_uselib.c 29 Jun 2003 22:29:33 -0000 1.12
+++ compat/linux/common/linux_uselib.c 16 Sep 2004 19:54:29 -0000
@@ -119,7 +119,7 @@ linux_sys_uselib(l, v, retval)
if ((error = vn_rdwr(UIO_READ, vp, (caddr_t) &hdr, LINUX_AOUT_HDR_SIZE,
0, UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred,
- &rem, p))) {
+ &rem, NULL))) {
vrele(vp);
return error;
}
Index: compat/netbsd32/netbsd32_core.c
===================================================================
RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_core.c,v
retrieving revision 1.9
diff -u -p -r1.9 netbsd32_core.c
--- compat/netbsd32/netbsd32_core.c 15 Sep 2003 18:35:02 -0000 1.9
+++ compat/netbsd32/netbsd32_core.c 16 Sep 2004 19:54:29 -0000
@@ -114,7 +114,7 @@ coredump_netbsd32(struct lwp *l, struct
/* Now write out the core header. */
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cs.core,
(int)cs.core.c_hdrsize, (off_t)0,
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
return (error);
}
@@ -145,7 +145,7 @@ coredump_writesegs_netbsd32(struct proc
error = vn_rdwr(UIO_WRITE, vp,
(caddr_t)&cseg, cs->core.c_seghdrsize,
cs->offset, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return (error);
Index: compat/osf1/osf1_exec_ecoff.c
===================================================================
RCS file: /cvsroot/src/sys/compat/osf1/osf1_exec_ecoff.c,v
retrieving revision 1.9
diff -u -p -r1.9 osf1_exec_ecoff.c
--- compat/osf1/osf1_exec_ecoff.c 8 Aug 2003 18:57:07 -0000 1.9
+++ compat/osf1/osf1_exec_ecoff.c 16 Sep 2004 19:54:29 -0000
@@ -256,7 +256,7 @@ osf1_exec_ecoff_dynamic(struct proc *p,
*/
if ((error = vn_rdwr(UIO_READ, ldr_vp, (caddr_t)&ldr_exechdr,
sizeof ldr_exechdr, 0, UIO_SYSSPACE, 0, p->p_ucred,
- &resid, p)) != 0)
+ &resid, NULL)) != 0)
goto bad;
if (resid != 0) {
error = ENOEXEC;
Index: compat/sunos/sunos_misc.c
===================================================================
RCS file: /cvsroot/src/sys/compat/sunos/sunos_misc.c,v
retrieving revision 1.129
diff -u -p -r1.129 sunos_misc.c
--- compat/sunos/sunos_misc.c 25 Apr 2004 06:25:52 -0000 1.129
+++ compat/sunos/sunos_misc.c 16 Sep 2004 19:54:31 -0000
@@ -524,7 +524,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
Index: compat/sunos32/sunos32_misc.c
===================================================================
RCS file: /cvsroot/src/sys/compat/sunos32/sunos32_misc.c,v
retrieving revision 1.27
diff -u -p -r1.27 sunos32_misc.c
--- compat/sunos32/sunos32_misc.c 25 Apr 2004 06:02:20 -0000 1.27
+++ compat/sunos32/sunos32_misc.c 16 Sep 2004 19:54:32 -0000
@@ -742,7 +742,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
Index: compat/svr4/svr4_misc.c
===================================================================
RCS file: /cvsroot/src/sys/compat/svr4/svr4_misc.c,v
retrieving revision 1.109
diff -u -p -r1.109 svr4_misc.c
--- compat/svr4/svr4_misc.c 21 Apr 2004 02:40:05 -0000 1.109
+++ compat/svr4/svr4_misc.c 16 Sep 2004 19:54:33 -0000
@@ -302,7 +302,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
@@ -422,7 +422,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
Index: compat/svr4_32/svr4_32_misc.c
===================================================================
RCS file: /cvsroot/src/sys/compat/svr4_32/svr4_32_misc.c,v
retrieving revision 1.28
diff -u -p -r1.28 svr4_32_misc.c
--- compat/svr4_32/svr4_32_misc.c 22 Apr 2004 14:32:09 -0000 1.28
+++ compat/svr4_32/svr4_32_misc.c 16 Sep 2004 19:54:35 -0000
@@ -304,7 +304,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
@@ -424,7 +424,7 @@ again:
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = buflen;
auio.uio_offset = off;
/*
Index: dev/kloader.c
===================================================================
RCS file: /cvsroot/src/sys/dev/kloader.c,v
retrieving revision 1.1
diff -u -p -r1.1 kloader.c
--- dev/kloader.c 6 Jul 2004 13:09:18 -0000 1.1
+++ dev/kloader.c 16 Sep 2004 19:54:36 -0000
@@ -633,7 +633,7 @@ kloader_read(size_t ofs, size_t size, vo
int error;
error = vn_rdwr(UIO_READ, vp, buf, size, ofs, UIO_SYSSPACE,
- IO_NODELOCKED | IO_SYNC, p->p_ucred, &resid, p);
+ IO_NODELOCKED | IO_SYNC, p->p_ucred, &resid, NULL);
if (error)
PRINTF("read error.\n");
Index: dev/usb/ubtbcmfw.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/ubtbcmfw.c,v
retrieving revision 1.8
diff -u -p -r1.8 ubtbcmfw.c
--- dev/usb/ubtbcmfw.c 23 Apr 2004 17:25:25 -0000 1.8
+++ dev/usb/ubtbcmfw.c 16 Sep 2004 19:54:40 -0000
@@ -246,7 +246,7 @@ ubtbcmfw_load_file(usbd_device_handle de
for (offs = 0; ; offs += size) {
size = sizeof buf;
error = vn_rdwr(UIO_READ, vp, buf, size, offs, UIO_SYSSPACE,
- IO_NODELOCKED | IO_SYNC, p->p_ucred, &resid, p);
+ IO_NODELOCKED | IO_SYNC, p->p_ucred, &resid, NULL);
size -= resid;
if (error || size == 0)
break;
Index: fs/cd9660/cd9660_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/fs/cd9660/cd9660_vnops.c,v
retrieving revision 1.9
diff -u -p -r1.9 cd9660_vnops.c
--- fs/cd9660/cd9660_vnops.c 4 May 2004 13:26:58 -0000 1.9
+++ fs/cd9660/cd9660_vnops.c 16 Sep 2004 19:54:41 -0000
@@ -219,7 +219,7 @@ cd9660_getattr(v)
auio.uio_offset = 0;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = ap->a_p;
+ auio.uio_procp = NULL;
auio.uio_resid = MAXPATHLEN;
rdlnk.a_uio = &auio;
rdlnk.a_vp = ap->a_vp;
Index: fs/smbfs/smbfs_io.c
===================================================================
RCS file: /cvsroot/src/sys/fs/smbfs/smbfs_io.c,v
retrieving revision 1.17
diff -u -p -r1.17 smbfs_io.c
--- fs/smbfs/smbfs_io.c 4 May 2004 13:26:58 -0000 1.17
+++ fs/smbfs/smbfs_io.c 16 Sep 2004 19:54:42 -0000
@@ -313,7 +313,7 @@ smbfs_doio(struct buf *bp, struct ucred
uiop->uio_iov = &io;
uiop->uio_iovcnt = 1;
uiop->uio_segflg = UIO_SYSSPACE;
- uiop->uio_procp = p;
+ uiop->uio_procp = NULL;
smb_makescred(&scred, p, cr);
Index: fs/union/union_subr.c
===================================================================
RCS file: /cvsroot/src/sys/fs/union/union_subr.c,v
retrieving revision 1.10
diff -u -p -r1.10 union_subr.c
--- fs/union/union_subr.c 12 May 2004 02:07:39 -0000 1.10
+++ fs/union/union_subr.c 16 Sep 2004 19:54:43 -0000
@@ -637,7 +637,7 @@ union_copyfile(fvp, tvp, cred, p)
* give up at the first sign of trouble.
*/
- uio.uio_procp = p;
+ uio.uio_procp = NULL;
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_offset = 0;
Index: kern/core_elf32.c
===================================================================
RCS file: /cvsroot/src/sys/kern/core_elf32.c,v
retrieving revision 1.13
diff -u -p -r1.13 core_elf32.c
--- kern/core_elf32.c 21 Apr 2004 18:40:38 -0000 1.13
+++ kern/core_elf32.c 16 Sep 2004 19:54:43 -0000
@@ -152,7 +152,7 @@ ELFNAMEEND(coredump)(struct lwp *l, stru
/* Write out the ELF header. */
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&ehdr,
(int)sizeof(ehdr), (off_t)0,
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
ws.offset = ehdr.e_phoff;
notestart = ws.offset + (sizeof(phdr) * cs.npsections);
@@ -178,7 +178,7 @@ ELFNAMEEND(coredump)(struct lwp *l, stru
error = vn_rdwr(UIO_WRITE, vp,
(caddr_t)&phdr, sizeof(phdr),
ws.offset, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return (error);
@@ -250,7 +250,7 @@ ELFNAMEEND(coredump_writeseghdrs)(struct
error = vn_rdwr(UIO_WRITE, vp,
(caddr_t)&phdr, sizeof(phdr),
ws->offset, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return (error);
@@ -456,7 +456,7 @@ ELFNAMEEND(coredump_writenote)(struct pr
error = vn_rdwr(UIO_WRITE, vp,
(caddr_t) nhdr, sizeof(*nhdr),
offset, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return (error);
@@ -465,7 +465,7 @@ ELFNAMEEND(coredump_writenote)(struct pr
error = vn_rdwr(UIO_WRITE, vp,
(caddr_t)name, nhdr->n_namesz,
offset, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return (error);
@@ -474,7 +474,7 @@ ELFNAMEEND(coredump_writenote)(struct pr
error = vn_rdwr(UIO_WRITE, vp,
data, nhdr->n_descsz,
offset, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
return (error);
}
Index: kern/core_netbsd.c
===================================================================
RCS file: /cvsroot/src/sys/kern/core_netbsd.c,v
retrieving revision 1.7
diff -u -p -r1.7 core_netbsd.c
--- kern/core_netbsd.c 14 Sep 2003 06:59:14 -0000 1.7
+++ kern/core_netbsd.c 16 Sep 2004 19:54:43 -0000
@@ -114,7 +114,7 @@ coredump_netbsd(struct lwp *l, struct vn
/* Now write out the core header. */
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cs.core,
(int)cs.core.c_hdrsize, (off_t)0,
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
return (error);
}
@@ -145,7 +145,7 @@ coredump_writesegs_netbsd(struct proc *p
error = vn_rdwr(UIO_WRITE, vp,
(caddr_t)&cseg, cs->core.c_seghdrsize,
cs->offset, UIO_SYSSPACE,
- IO_NODELOCKED|IO_UNIT, cred, NULL, p);
+ IO_NODELOCKED|IO_UNIT, cred, NULL, NULL);
if (error)
return (error);
Index: kern/exec_subr.c
===================================================================
RCS file: /cvsroot/src/sys/kern/exec_subr.c,v
retrieving revision 1.41
diff -u -p -r1.41 exec_subr.c
--- kern/exec_subr.c 29 Aug 2003 01:44:02 -0000 1.41
+++ kern/exec_subr.c 16 Sep 2004 19:54:44 -0000
@@ -280,7 +280,7 @@ exec_read_from(struct proc *p, struct vn
size_t resid;
if ((error = vn_rdwr(UIO_READ, vp, buf, size, off, UIO_SYSSPACE,
- 0, p->p_ucred, &resid, p)) != 0)
+ 0, p->p_ucred, &resid, NULL)) != 0)
return error;
/*
* See if we got all of it
Index: kern/kern_acct.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_acct.c,v
retrieving revision 1.57
diff -u -p -r1.57 kern_acct.c
--- kern/kern_acct.c 21 Apr 2004 01:05:38 -0000 1.57
+++ kern/kern_acct.c 16 Sep 2004 19:54:44 -0000
@@ -372,7 +372,7 @@ acct_process(p)
VOP_LEASE(acct_vp, p, p->p_ucred, LEASE_WRITE);
error = vn_rdwr(UIO_WRITE, acct_vp, (caddr_t)&acct,
sizeof(acct), (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT,
- acct_ucred, NULL, p);
+ acct_ucred, NULL, NULL);
if (error != 0)
log(LOG_ERR, "Accounting: write failed %d\n", error);
Index: kern/kern_exec.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_exec.c,v
retrieving revision 1.189
diff -u -p -r1.189 kern_exec.c
--- kern/kern_exec.c 10 Sep 2004 06:09:15 -0000 1.189
+++ kern/kern_exec.c 16 Sep 2004 19:54:45 -0000
@@ -272,7 +272,7 @@ check_exec(struct proc *p, struct exec_p
/* now we have the file, get the exec header */
uvn_attach(vp, VM_PROT_READ);
error = vn_rdwr(UIO_READ, vp, epp->ep_hdr, epp->ep_hdrlen, 0,
- UIO_SYSSPACE, 0, p->p_ucred, &resid, p);
+ UIO_SYSSPACE, 0, p->p_ucred, &resid, NULL);
if (error)
goto bad2;
epp->ep_hdrvalid = epp->ep_hdrlen - resid;
Index: kern/kern_verifiedexec.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_verifiedexec.c,v
retrieving revision 1.7
diff -u -p -r1.7 kern_verifiedexec.c
--- kern/kern_verifiedexec.c 18 Nov 2003 13:13:03 -0000 1.7
+++ kern/kern_verifiedexec.c 16 Sep 2004 19:54:46 -0000
@@ -87,7 +87,7 @@ md5_fingerprint(struct vnode *vp, struct
count = BUF_SIZE;
error = vn_rdwr(UIO_READ, vp, filebuf, count, j,
- UIO_SYSSPACE, 0, p->p_ucred, &resid, p);
+ UIO_SYSSPACE, 0, p->p_ucred, &resid, NULL);
if (error) {
free(filebuf, M_TEMP);
@@ -123,7 +123,7 @@ sha1_fingerprint(struct vnode *vp, struc
count = BUF_SIZE;
error = vn_rdwr(UIO_READ, vp, filebuf, count, j,
- UIO_SYSSPACE, 0, p->p_ucred, &resid, p);
+ UIO_SYSSPACE, 0, p->p_ucred, &resid, NULL);
if (error) {
free(filebuf, M_TEMP);
Index: kern/sys_process.c
===================================================================
RCS file: /cvsroot/src/sys/kern/sys_process.c,v
retrieving revision 1.91
diff -u -p -r1.91 sys_process.c
--- kern/sys_process.c 22 Jun 2004 02:06:55 -0000 1.91
+++ kern/sys_process.c 16 Sep 2004 19:54:46 -0000
@@ -314,7 +314,7 @@ sys_ptrace(l, v, retval)
uio.uio_resid = sizeof(tmp);
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = write ? UIO_WRITE : UIO_READ;
- uio.uio_procp = p;
+ uio.uio_procp = NULL;
error = process_domem(p, t, &uio);
if (!write)
*retval = tmp;
Index: kern/vfs_getcwd.c
===================================================================
RCS file: /cvsroot/src/sys/kern/vfs_getcwd.c,v
retrieving revision 1.25
diff -u -p -r1.25 vfs_getcwd.c
--- kern/vfs_getcwd.c 23 Mar 2004 13:22:05 -0000 1.25
+++ kern/vfs_getcwd.c 16 Sep 2004 19:54:47 -0000
@@ -195,7 +195,7 @@ unionread:
uio.uio_resid = dirbuflen;
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_READ;
- uio.uio_procp = p;
+ uio.uio_procp = NULL;
eofflag = 0;
Index: kern/vfs_lookup.c
===================================================================
RCS file: /cvsroot/src/sys/kern/vfs_lookup.c,v
retrieving revision 1.54
diff -u -p -r1.54 vfs_lookup.c
--- kern/vfs_lookup.c 8 Dec 2003 14:23:33 -0000 1.54
+++ kern/vfs_lookup.c 16 Sep 2004 19:54:47 -0000
@@ -206,7 +206,7 @@ namei(ndp)
auio.uio_offset = 0;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = (struct proc *)0;
+ auio.uio_procp = NULL;
auio.uio_resid = MAXPATHLEN;
error = VOP_READLINK(ndp->ni_vp, &auio, cnp->cn_cred);
if (error) {
Index: miscfs/genfs/genfs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/miscfs/genfs/genfs_vnops.c,v
retrieving revision 1.87
diff -u -p -r1.87 genfs_vnops.c
--- miscfs/genfs/genfs_vnops.c 27 May 2004 12:53:25 -0000 1.87
+++ miscfs/genfs/genfs_vnops.c 16 Sep 2004 19:54:50 -0000
@@ -1624,7 +1624,7 @@ genfs_compat_getpages(void *v)
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_READ;
uio.uio_resid = PAGE_SIZE;
- uio.uio_procp = curproc;
+ uio.uio_procp = NULL;
/* XXX vn_lock */
error = VOP_READ(vp, &uio, 0, cred);
if (error) {
@@ -1678,7 +1678,7 @@ genfs_compat_gop_write(struct vnode *vp,
uio.uio_segflg = UIO_SYSSPACE;
uio.uio_rw = UIO_WRITE;
uio.uio_resid = npages << PAGE_SHIFT;
- uio.uio_procp = curproc;
+ uio.uio_procp = NULL;
/* XXX vn_lock */
error = VOP_WRITE(vp, &uio, 0, cred);
Index: miscfs/portal/portal_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/miscfs/portal/portal_vnops.c,v
retrieving revision 1.55
diff -u -p -r1.55 portal_vnops.c
--- miscfs/portal/portal_vnops.c 22 May 2004 22:52:14 -0000 1.55
+++ miscfs/portal/portal_vnops.c 16 Sep 2004 19:54:51 -0000
@@ -415,7 +415,7 @@ portal_open(v)
auio.uio_iovcnt = 2;
auio.uio_rw = UIO_WRITE;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_offset = 0;
auio.uio_resid = aiov[0].iov_len + aiov[1].iov_len;
Index: netccitt/pk_acct.c
===================================================================
RCS file: /cvsroot/src/sys/netccitt/pk_acct.c,v
retrieving revision 1.17
diff -u -p -r1.17 pk_acct.c
--- netccitt/pk_acct.c 7 Aug 2003 16:33:03 -0000 1.17
+++ netccitt/pk_acct.c 16 Sep 2004 19:54:51 -0000
@@ -180,5 +180,5 @@ pk_acct(lcp)
(void) vn_rdwr(UIO_WRITE, vp, (caddr_t)&acbuf, sizeof (acbuf),
(off_t)0, UIO_SYSSPACE, IO_UNIT|IO_APPEND,
curproc -> p_ucred, (size_t *)0,
- (struct proc *)0);
+ NULL);
}
Index: netsmb/smb_trantcp.c
===================================================================
RCS file: /cvsroot/src/sys/netsmb/smb_trantcp.c,v
retrieving revision 1.16
diff -u -p -r1.16 smb_trantcp.c
--- netsmb/smb_trantcp.c 22 May 2004 22:52:15 -0000 1.16
+++ netsmb/smb_trantcp.c 16 Sep 2004 19:54:53 -0000
@@ -411,7 +411,7 @@ nbssn_recvhdr(struct nbpcb *nbp, int *le
auio.uio_rw = UIO_READ;
auio.uio_offset = 0;
auio.uio_resid = sizeof(len);
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
#ifndef __NetBSD__
error = so->so_proto->pr_usrreqs->pru_soreceive
(so, (struct sockaddr **)NULL, &auio,
Index: nfs/nfs_bio.c
===================================================================
RCS file: /cvsroot/src/sys/nfs/nfs_bio.c,v
retrieving revision 1.120
diff -u -p -r1.120 nfs_bio.c
--- nfs/nfs_bio.c 15 Sep 2004 09:50:56 -0000 1.120
+++ nfs/nfs_bio.c 16 Sep 2004 19:54:54 -0000
@@ -1231,7 +1231,7 @@ nfs_doio(bp, p)
uiop->uio_iov = &io;
uiop->uio_iovcnt = 1;
uiop->uio_segflg = UIO_SYSSPACE;
- uiop->uio_procp = p;
+ uiop->uio_procp = NULL;
uiop->uio_offset = (((off_t)bp->b_blkno) << DEV_BSHIFT);
io.iov_base = bp->b_data;
io.iov_len = uiop->uio_resid = bp->b_bcount;
Index: nfs/nfs_serv.c
===================================================================
RCS file: /cvsroot/src/sys/nfs/nfs_serv.c,v
retrieving revision 1.89
diff -u -p -r1.89 nfs_serv.c
--- nfs/nfs_serv.c 31 May 2004 08:47:08 -0000 1.89
+++ nfs/nfs_serv.c 16 Sep 2004 19:54:58 -0000
@@ -530,7 +530,7 @@ nfsrv_readlink(nfsd, slp, procp, mrq)
uiop->uio_resid = len;
uiop->uio_rw = UIO_READ;
uiop->uio_segflg = UIO_SYSSPACE;
- uiop->uio_procp = (struct proc *)0;
+ uiop->uio_procp = NULL;
error = nfsrv_fhtovp(fhp, 1, &vp, cred, slp, nam,
&rdonly, (nfsd->nd_flag & ND_KERBAUTH), FALSE);
if (error) {
@@ -950,7 +950,7 @@ nfsrv_write(nfsd, slp, procp, mrq)
uiop->uio_resid = len;
uiop->uio_rw = UIO_WRITE;
uiop->uio_segflg = UIO_SYSSPACE;
- uiop->uio_procp = (struct proc *)0;
+ uiop->uio_procp = NULL;
uiop->uio_offset = off;
error = VOP_WRITE(vp, uiop, ioflags, cred);
nfsstats.srvvop_writes++;
@@ -1189,7 +1189,7 @@ loop1:
ioflags = (IO_METASYNC | IO_SYNC | IO_NODELOCKED);
uiop->uio_rw = UIO_WRITE;
uiop->uio_segflg = UIO_SYSSPACE;
- uiop->uio_procp = (struct proc *)0;
+ uiop->uio_procp = NULL;
uiop->uio_offset = nfsd->nd_off;
uiop->uio_resid = nfsd->nd_eoff - nfsd->nd_off;
if (uiop->uio_resid > 0) {
@@ -2232,7 +2232,7 @@ nfsrv_symlink(nfsd, slp, procp, mrq)
io.uio_iovcnt = 1;
io.uio_segflg = UIO_SYSSPACE;
io.uio_rw = UIO_READ;
- io.uio_procp = (struct proc *)0;
+ io.uio_procp = NULL;
nfsm_mtouio(&io, len2);
if (!v3) {
nfsm_dissect(sp, struct nfsv2_sattr *, NFSX_V2SATTR);
@@ -2655,7 +2655,7 @@ again:
io.uio_resid = fullsiz;
io.uio_segflg = UIO_SYSSPACE;
io.uio_rw = UIO_READ;
- io.uio_procp = (struct proc *)0;
+ io.uio_procp = NULL;
eofflag = 0;
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
@@ -2914,7 +2914,7 @@ again:
io.uio_resid = fullsiz;
io.uio_segflg = UIO_SYSSPACE;
io.uio_rw = UIO_READ;
- io.uio_procp = (struct proc *)0;
+ io.uio_procp = NULL;
eofflag = 0;
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
Index: nfs/nfs_socket.c
===================================================================
RCS file: /cvsroot/src/sys/nfs/nfs_socket.c,v
retrieving revision 1.110
diff -u -p -r1.110 nfs_socket.c
--- nfs/nfs_socket.c 24 Aug 2004 20:09:44 -0000 1.110
+++ nfs/nfs_socket.c 16 Sep 2004 19:54:59 -0000
@@ -610,7 +610,7 @@ tryagain:
auio.uio_rw = UIO_READ;
auio.uio_offset = 0;
auio.uio_resid = sizeof(u_int32_t);
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
do {
rcvflg = MSG_WAITALL;
error = (*so->so_receive)(so, (struct mbuf **)0, &auio,
Index: nfs/nfs_subs.c
===================================================================
RCS file: /cvsroot/src/sys/nfs/nfs_subs.c,v
retrieving revision 1.135
diff -u -p -r1.135 nfs_subs.c
--- nfs/nfs_subs.c 15 Sep 2004 09:50:56 -0000 1.135
+++ nfs/nfs_subs.c 16 Sep 2004 19:55:01 -0000
@@ -1938,7 +1938,7 @@ nfs_cookieheuristic(vp, flagp, p, cred)
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = p;
+ auio.uio_procp = NULL;
auio.uio_resid = NFS_DIRFRAGSIZ;
auio.uio_offset = 0;
@@ -2181,7 +2181,7 @@ nfs_namei(ndp, fhp, len, slp, nam, mdp,
auio.uio_offset = 0;
auio.uio_rw = UIO_READ;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = (struct proc *)0;
+ auio.uio_procp = NULL;
auio.uio_resid = MAXPATHLEN;
error = VOP_READLINK(ndp->ni_vp, &auio, cnp->cn_cred);
if (error) {
Index: opencrypto/cryptodev.c
===================================================================
RCS file: /cvsroot/src/sys/opencrypto/cryptodev.c,v
retrieving revision 1.10
diff -u -p -r1.10 cryptodev.c
--- opencrypto/cryptodev.c 19 Nov 2003 04:14:07 -0000 1.10
+++ opencrypto/cryptodev.c 16 Sep 2004 19:55:02 -0000
@@ -352,7 +352,7 @@ cryptodev_op(struct csession *cse, struc
cse->uio.uio_resid = 0;
cse->uio.uio_segflg = UIO_SYSSPACE;
cse->uio.uio_rw = UIO_WRITE;
- cse->uio.uio_procp = p;
+ cse->uio.uio_procp = NULL;
cse->uio.uio_iov = cse->iovec;
bzero(&cse->iovec, sizeof(cse->iovec));
cse->uio.uio_iov[0].iov_len = cop->len;
Index: ufs/ext2fs/ext2fs_lookup.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ext2fs/ext2fs_lookup.c,v
retrieving revision 1.29
diff -u -p -r1.29 ext2fs_lookup.c
--- ufs/ext2fs/ext2fs_lookup.c 15 Aug 2004 07:19:56 -0000 1.29
+++ ufs/ext2fs/ext2fs_lookup.c 16 Sep 2004 19:55:03 -0000
@@ -821,7 +821,7 @@ ext2fs_direnter(ip, dvp, cnp)
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_WRITE;
auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_procp = (struct proc *)0;
+ auio.uio_procp = NULL;
error = VOP_WRITE(dvp, &auio, IO_SYNC, cnp->cn_cred);
if (dirblksiz > dvp->v_mount->mnt_stat.f_bsize)
/* XXX should grow with balloc() */
@@ -1007,7 +1007,7 @@ ext2fs_dirempty(ip, parentino, cred)
for (off = 0; off < ip->i_e2fs_size; off += fs2h16(dp->e2d_reclen)) {
error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)dp, MINDIRSIZ, off,
- UIO_SYSSPACE, IO_NODELOCKED, cred, &count, (struct proc *)0);
+ UIO_SYSSPACE, IO_NODELOCKED, cred, &count, NULL);
/*
* Since we read MINDIRSIZ, residual must
* be 0 unless we're at end of file.
@@ -1073,7 +1073,7 @@ ext2fs_checkpath(source, target, cred)
error = vn_rdwr(UIO_READ, vp, (caddr_t)&dirbuf,
sizeof (struct ext2fs_dirtemplate), (off_t)0,
UIO_SYSSPACE, IO_NODELOCKED, cred, (size_t *)0,
- (struct proc *)0);
+ NULL);
if (error != 0)
break;
namlen = dirbuf.dotdot_namlen;
Index: ufs/ext2fs/ext2fs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ext2fs/ext2fs_vnops.c,v
retrieving revision 1.55
diff -u -p -r1.55 ext2fs_vnops.c
--- ufs/ext2fs/ext2fs_vnops.c 15 Aug 2004 07:19:56 -0000 1.55
+++ ufs/ext2fs/ext2fs_vnops.c 16 Sep 2004 19:55:05 -0000
@@ -979,7 +979,7 @@ abortit:
error = vn_rdwr(UIO_READ, fvp, (caddr_t)&dirbuf,
sizeof (struct ext2fs_dirtemplate), (off_t)0,
UIO_SYSSPACE, IO_NODELOCKED,
- tcnp->cn_cred, (size_t *)0, (struct proc *)0);
+ tcnp->cn_cred, (size_t *)0, NULL);
if (error == 0) {
namlen = dirbuf.dotdot_namlen;
if (namlen != 2 ||
@@ -995,7 +995,7 @@ abortit:
(off_t)0, UIO_SYSSPACE,
IO_NODELOCKED|IO_SYNC,
tcnp->cn_cred, (size_t *)0,
- (struct proc *)0);
+ NULL);
cache_purge(fdvp);
}
}
@@ -1108,7 +1108,7 @@ ext2fs_mkdir(v)
dirtemplate.dotdot_name[0] = dirtemplate.dotdot_name[1] = '.';
error = vn_rdwr(UIO_WRITE, tvp, (caddr_t)&dirtemplate,
sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE,
- IO_NODELOCKED|IO_SYNC, cnp->cn_cred, (size_t *)0, (struct proc *)0);
+ IO_NODELOCKED|IO_SYNC, cnp->cn_cred, (size_t *)0, NULL);
if (error) {
dp->i_e2fs_nlink--;
dp->i_flag |= IN_CHANGE;
@@ -1263,7 +1263,7 @@ ext2fs_symlink(v)
} else
error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0,
UIO_SYSSPACE, IO_NODELOCKED, ap->a_cnp->cn_cred,
- (size_t *)0, (struct proc *)0);
+ (size_t *)0, NULL);
if (error)
vput(vp);
return (error);
Index: ufs/ffs/ffs_snapshot.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ffs/ffs_snapshot.c,v
retrieving revision 1.6
diff -u -p -r1.6 ffs_snapshot.c
--- ufs/ffs/ffs_snapshot.c 29 Aug 2004 10:13:48 -0000 1.6
+++ ufs/ffs/ffs_snapshot.c 16 Sep 2004 19:55:07 -0000
@@ -194,7 +194,7 @@ ffs_snapshot(mp, vp, ctime)
goto out;
error = vn_rdwr(UIO_WRITE, vp,
cgbuf, fs->fs_bsize, lblktosize(fs, (off_t)(numblks - 1)),
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, p->p_ucred, NULL, p);
+ UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, p->p_ucred, NULL, NULL);
if (error)
goto out;
/*
@@ -560,7 +560,7 @@ out1:
*/
error = vn_rdwr(UIO_WRITE, vp,
(caddr_t)snapblklist, snaplistsize*sizeof(ufs2_daddr_t), ip->i_size,
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, p->p_ucred, NULL, p);
+ UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, p->p_ucred, NULL, NULL);
if (error) {
fs->fs_snapinum[snaploc] = 0;
FREE(snapblklist, M_UFSMNT);
@@ -1726,7 +1726,7 @@ ffs_snapshot_mount(mp)
error = vn_rdwr(UIO_READ, vp,
(caddr_t)&snaplistsize, sizeof(snaplistsize),
lblktosize(fs, howmany(fs->fs_size, fs->fs_frag)),
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, p->p_ucred, NULL, p);
+ UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, p->p_ucred, NULL, NULL);
if (error) {
printf("ffs_snapshot_mount: read_1 failed %d\n", error);
VOP_UNLOCK(vp, 0);
@@ -1738,7 +1738,7 @@ ffs_snapshot_mount(mp)
error = vn_rdwr(UIO_READ, vp,
(caddr_t)snapblklist, snaplistsize * sizeof(ufs2_daddr_t),
lblktosize(fs, howmany(fs->fs_size, fs->fs_frag)),
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, p->p_ucred, NULL, p);
+ UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, p->p_ucred, NULL, NULL);
if (error) {
printf("ffs_snapshot_mount: read_2 failed %d\n", error);
VOP_UNLOCK(vp, 0);
Index: ufs/ufs/ufs_lookup.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ufs/ufs_lookup.c,v
retrieving revision 1.59
diff -u -p -r1.59 ufs_lookup.c
--- ufs/ufs/ufs_lookup.c 15 Aug 2004 21:44:11 -0000 1.59
+++ ufs/ufs/ufs_lookup.c 16 Sep 2004 19:55:08 -0000
@@ -1097,7 +1097,7 @@ ufs_dirempty(ip, parentino, cred)
for (off = 0; off < ip->i_size;
off += ufs_rw16(dp->d_reclen, needswap)) {
error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)dp, MINDIRSIZ, off,
- UIO_SYSSPACE, IO_NODELOCKED, cred, &count, (struct proc *)0);
+ UIO_SYSSPACE, IO_NODELOCKED, cred, &count, NULL);
/*
* Since we read MINDIRSIZ, residual must
* be 0 unless we're at end of file.
@@ -1174,7 +1174,7 @@ ufs_checkpath(source, target, cred)
}
error = vn_rdwr(UIO_READ, vp, (caddr_t)&dirbuf,
sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE,
- IO_NODELOCKED, cred, NULL, (struct proc *)0);
+ IO_NODELOCKED, cred, NULL, NULL);
if (error != 0)
break;
#if (BYTE_ORDER == LITTLE_ENDIAN)
Index: ufs/ufs/ufs_quota.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ufs/ufs_quota.c,v
retrieving revision 1.31
diff -u -p -r1.31 ufs_quota.c
--- ufs/ufs/ufs_quota.c 15 Aug 2004 07:19:58 -0000 1.31
+++ ufs/ufs/ufs_quota.c 16 Sep 2004 19:55:09 -0000
@@ -806,7 +806,7 @@ dqget(vp, id, ump, type, dqp)
auio.uio_offset = (off_t)(id * sizeof (struct dqblk));
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_rw = UIO_READ;
- auio.uio_procp = (struct proc *)0;
+ auio.uio_procp = NULL;
error = VOP_READ(dqvp, &auio, 0, ump->um_cred[type]);
if (auio.uio_resid == sizeof(struct dqblk) && error == 0)
memset((caddr_t)&dq->dq_dqb, 0, sizeof(struct dqblk));
@@ -917,7 +917,7 @@ dqsync(vp, dq)
auio.uio_offset = (off_t)(dq->dq_id * sizeof (struct dqblk));
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_rw = UIO_WRITE;
- auio.uio_procp = (struct proc *)0;
+ auio.uio_procp = NULL;
error = VOP_WRITE(dqvp, &auio, 0, dq->dq_ump->um_cred[dq->dq_type]);
if (auio.uio_resid && error == 0)
error = EIO;
Index: ufs/ufs/ufs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ufs/ufs_vnops.c,v
retrieving revision 1.121
diff -u -p -r1.121 ufs_vnops.c
--- ufs/ufs/ufs_vnops.c 15 Aug 2004 21:53:03 -0000 1.121
+++ ufs/ufs/ufs_vnops.c 16 Sep 2004 19:55:11 -0000
@@ -1539,7 +1539,7 @@ ufs_symlink(void *v)
} else
error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0,
UIO_SYSSPACE, IO_NODELOCKED, ap->a_cnp->cn_cred, NULL,
- (struct proc *)0);
+ NULL);
if (error)
vput(vp);
return (error);
--Boundary-00=_sAfSBmzLv5nIrzW--