summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/fdc/fdc.c3
-rw-r--r--sys/dev/vinum/vinumio.c3
-rw-r--r--sys/dev/vinum/vinumrequest.c3
-rw-r--r--sys/fs/specfs/spec_vnops.c5
-rw-r--r--sys/i386/isa/fd.c3
-rw-r--r--sys/isa/fd.c3
-rw-r--r--sys/kern/kern_physio.c3
-rw-r--r--sys/kern/vfs_aio.c6
-rw-r--r--sys/kern/vfs_bio.c5
-rw-r--r--sys/miscfs/devfs/devfs_vnops.c5
-rw-r--r--sys/miscfs/specfs/spec_vnops.c5
-rw-r--r--sys/nfs/nfs.h6
-rw-r--r--sys/nfs/nfs_bio.c16
-rw-r--r--sys/nfs/nfs_vnops.c11
-rw-r--r--sys/nfsclient/nfs.h6
-rw-r--r--sys/nfsclient/nfs_bio.c16
-rw-r--r--sys/nfsclient/nfs_vnops.c11
-rw-r--r--sys/nfsclient/nfsargs.h6
-rw-r--r--sys/nfsclient/nfsstats.h6
-rw-r--r--sys/nfsserver/nfs.h6
-rw-r--r--sys/nfsserver/nfsrvstats.h6
-rw-r--r--sys/pc98/cbus/fdc.c3
-rw-r--r--sys/pc98/pc98/fd.c3
-rw-r--r--sys/sys/bio.h5
-rw-r--r--sys/sys/buf.h5
-rw-r--r--sys/vm/swap_pager.c8
-rw-r--r--sys/vm/vm_pager.c6
-rw-r--r--sys/vm/vnode_pager.c8
28 files changed, 77 insertions, 95 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 5ffa489..845107c 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -47,7 +47,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.136 1999/04/27 11:14:56 phk Exp $
+ * $Id: fd.c,v 1.137 1999/05/02 20:38:08 peter Exp $
*
*/
@@ -2194,7 +2194,6 @@ fdformat(dev, finfo, p)
PHOLD(p);
bzero((void *)bp, sizeof(struct buf));
bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
- bp->b_proc = p;
/*
* calculate a fake blkno, so fdstrategy() would initiate a
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index e8c2556..0d51fbb 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumio.c,v 1.24 1999/03/23 02:00:52 grog Exp grog $
+ * $Id: vinumio.c,v 1.21 1999/05/02 07:51:20 grog Exp $
*/
#define STATIC /* nothing while we're testing XXX */
@@ -284,7 +284,6 @@ driveio(struct drive *drive, char *buf, size_t length, off_t offset, int flag)
bp = geteblk(len); /* get a buffer header */
bp->b_flags = B_BUSY | flag; /* get busy */
- bp->b_proc = curproc; /* process */
bp->b_dev = drive->vp->v_un.vu_specinfo->si_rdev; /* device */
bp->b_blkno = offset / drive->partinfo.disklab->d_secsize; /* block number */
bp->b_data = buf;
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index f0d0cfb..d022fe6 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumrequest.c,v 1.23 1999/03/20 21:58:38 grog Exp grog $
+ * $Id: vinumrequest.c,v 1.18 1999/03/28 08:54:25 grog Exp $
*/
#define REALLYKERNEL
@@ -724,7 +724,6 @@ build_rq_buffer(struct rqelement *rqe, struct plex *plex)
/* Initialize the buf struct */
bzero(&rqe->b, sizeof(struct buf));
- bp->b_proc = ubp->b_proc; /* process pointer */
bp->b_flags = ubp->b_flags & (B_NOCACHE | B_READ | B_ASYNC); /* copy these flags from user bp */
bp->b_flags |= B_CALL | B_BUSY; /* inform us when it's done */
/*
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 7f76209..a3ee89f 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.81 1999/02/25 05:22:30 dillon Exp $
+ * $Id: spec_vnops.c,v 1.82 1999/04/05 19:38:30 julian Exp $
*/
#include <sys/param.h>
@@ -812,8 +812,7 @@ spec_getpages(ap)
bp->b_iodone = spec_getpages_iodone;
/* B_PHYS is not set, but it is nice to fill this in. */
- bp->b_proc = curproc;
- bp->b_rcred = bp->b_wcred = bp->b_proc->p_ucred;
+ bp->b_rcred = bp->b_wcred = curproc->p_ucred;
if (bp->b_rcred != NOCRED)
crhold(bp->b_rcred);
if (bp->b_wcred != NOCRED)
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 5ffa489..845107c 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -47,7 +47,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.136 1999/04/27 11:14:56 phk Exp $
+ * $Id: fd.c,v 1.137 1999/05/02 20:38:08 peter Exp $
*
*/
@@ -2194,7 +2194,6 @@ fdformat(dev, finfo, p)
PHOLD(p);
bzero((void *)bp, sizeof(struct buf));
bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
- bp->b_proc = p;
/*
* calculate a fake blkno, so fdstrategy() would initiate a
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 5ffa489..845107c 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -47,7 +47,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.136 1999/04/27 11:14:56 phk Exp $
+ * $Id: fd.c,v 1.137 1999/05/02 20:38:08 peter Exp $
*
*/
@@ -2194,7 +2194,6 @@ fdformat(dev, finfo, p)
PHOLD(p);
bzero((void *)bp, sizeof(struct buf));
bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
- bp->b_proc = p;
/*
* calculate a fake blkno, so fdstrategy() would initiate a
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 268a0bf..5406d92 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -16,7 +16,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id: kern_physio.c,v 1.30 1999/01/21 08:29:04 dillon Exp $
+ * $Id: kern_physio.c,v 1.31 1999/04/06 03:04:47 peter Exp $
*/
#include <sys/param.h>
@@ -72,7 +72,6 @@ physio(strategy, bp, dev, rw, minp, uio)
* get a copy of the kva from the physical buffer
*/
sa = bpa->b_data;
- bp->b_proc = curproc;
error = bp->b_error = 0;
for(i=0;i<uio->uio_iovcnt;i++) {
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index d833bd6..cd5c2ff 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
* bad that happens because of using this software isn't the responsibility
* of the author. This software is distributed AS-IS.
*
- * $Id: vfs_aio.c,v 1.46 1999/04/28 01:04:28 luoqi Exp $
+ * $Id: vfs_aio.c,v 1.47 1999/05/06 18:44:42 peter Exp $
*/
/*
@@ -1005,7 +1005,7 @@ aio_qphysio(p, aiocbe)
/*
* get a copy of the kva from the physical buffer
*/
- bp->b_proc = p;
+ bp->b_caller1 = p;
bp->b_dev = dev;
error = bp->b_error = 0;
@@ -1963,7 +1963,7 @@ aio_physwakeup(bp)
aiocbe = (struct aiocblist *)bp->b_spc;
if (aiocbe) {
- p = bp->b_proc;
+ p = bp->b_caller1;
aiocbe->jobstate = JOBST_JOBBFINISHED;
aiocbe->uaiocb._aiocb_private.status -= bp->b_resid;
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index d33fc2f..37bdf76 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -11,7 +11,7 @@
* 2. Absolutely no warranty of function or purpose is made by the author
* John S. Dyson.
*
- * $Id: vfs_bio.c,v 1.208 1999/05/02 23:56:10 alc Exp $
+ * $Id: vfs_bio.c,v 1.209 1999/05/06 17:06:41 phk Exp $
*/
/*
@@ -2958,8 +2958,7 @@ DB_SHOW_COMMAND(buffer, db_show_buffer)
return;
}
- db_printf("b_proc = %p,\nb_flags = 0x%b\n", (void *)bp->b_proc,
- (u_int)bp->b_flags, PRINT_BUF_FLAGS);
+ db_printf("b_flags = 0x%b\n", (u_int)bp->b_flags, PRINT_BUF_FLAGS);
db_printf("b_error = %d, b_bufsize = %ld, b_bcount = %ld, "
"b_resid = %ld\nb_dev = 0x%x, b_data = %p, "
"b_blkno = %d, b_pblkno = %d\n",
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index b924ef5..55771ec 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: devfs_vnops.c,v 1.71 1999/04/27 11:16:31 phk Exp $
+ * $Id: devfs_vnops.c,v 1.72 1999/04/28 11:37:15 phk Exp $
*/
@@ -1954,8 +1954,7 @@ devfs_getpages(struct vop_getpages_args *ap)
bp->b_iodone = devfs_getpages_iodone;
/* B_PHYS is not set, but it is nice to fill this in. */
- bp->b_proc = curproc;
- bp->b_rcred = bp->b_wcred = bp->b_proc->p_ucred;
+ bp->b_rcred = bp->b_wcred = curproc->p_ucred;
if (bp->b_rcred != NOCRED)
crhold(bp->b_rcred);
if (bp->b_wcred != NOCRED)
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 7f76209..a3ee89f 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.81 1999/02/25 05:22:30 dillon Exp $
+ * $Id: spec_vnops.c,v 1.82 1999/04/05 19:38:30 julian Exp $
*/
#include <sys/param.h>
@@ -812,8 +812,7 @@ spec_getpages(ap)
bp->b_iodone = spec_getpages_iodone;
/* B_PHYS is not set, but it is nice to fill this in. */
- bp->b_proc = curproc;
- bp->b_rcred = bp->b_wcred = bp->b_proc->p_ucred;
+ bp->b_rcred = bp->b_wcred = curproc->p_ucred;
if (bp->b_rcred != NOCRED)
crhold(bp->b_rcred);
if (bp->b_wcred != NOCRED)
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 78a54a2..6fd3a89 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.45 1999/02/25 00:03:50 peter Exp $
+ * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
*/
#ifndef _NFS_NFS_H_
@@ -605,7 +605,7 @@ int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
int *));
int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
-int nfs_asyncio __P((struct buf *, struct ucred *));
+int nfs_asyncio __P((struct buf *, struct ucred *, struct proc *));
int nfs_doio __P((struct buf *, struct ucred *, struct proc *));
int nfs_readlinkrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct proc *));
@@ -658,7 +658,7 @@ void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_sort __P((gid_t *, int));
void nfsrv_setcred __P((struct ucred *, struct ucred *));
-int nfs_writebp __P((struct buf *, int));
+int nfs_writebp __P((struct buf *, int, struct proc *));
int nfsrv_object_create __P((struct vnode *));
void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 0d8a782..c7269ef 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.69 1999/04/06 03:07:54 peter Exp $
+ * $Id: nfs_bio.c,v 1.70 1999/05/02 23:56:24 alc Exp $
*/
@@ -465,7 +465,7 @@ nfs_bioread(vp, uio, ioflag, cred)
if ((rabp->b_flags & (B_CACHE|B_DELWRI)) == 0) {
rabp->b_flags |= (B_READ | B_ASYNC);
vfs_busy_pages(rabp, 0);
- if (nfs_asyncio(rabp, cred)) {
+ if (nfs_asyncio(rabp, cred, p)) {
rabp->b_flags |= B_INVAL|B_ERROR;
vfs_unbusy_pages(rabp);
brelse(rabp);
@@ -627,7 +627,7 @@ nfs_bioread(vp, uio, ioflag, cred)
if ((rabp->b_flags & (B_CACHE|B_DELWRI)) == 0) {
rabp->b_flags |= (B_READ | B_ASYNC);
vfs_busy_pages(rabp, 0);
- if (nfs_asyncio(rabp, cred)) {
+ if (nfs_asyncio(rabp, cred, p)) {
rabp->b_flags |= B_INVAL|B_ERROR;
vfs_unbusy_pages(rabp);
brelse(rabp);
@@ -894,7 +894,6 @@ again:
if (bp->b_dirtyend > 0 &&
(on > bp->b_dirtyend || (on + n) < bp->b_dirtyoff)) {
- bp->b_proc = p;
if (VOP_BWRITE(bp) == EINTR)
return (EINTR);
goto again;
@@ -960,7 +959,6 @@ again:
* to turn off caching in this case. Very odd. XXX
*/
if ((np->n_flag & NQNFSNONCACHE) || (ioflag & IO_SYNC)) {
- bp->b_proc = p;
if (ioflag & IO_INVAL)
bp->b_flags |= B_NOCACHE;
error = VOP_BWRITE(bp);
@@ -973,9 +971,8 @@ again:
}
} else if ((n + on) == biosize &&
(nmp->nm_flag & NFSMNT_NQNFS) == 0) {
- bp->b_proc = (struct proc *)0;
bp->b_flags |= B_ASYNC;
- (void)nfs_writebp(bp, 0);
+ (void)nfs_writebp(bp, 0, 0);
} else {
bdwrite(bp);
}
@@ -1097,9 +1094,10 @@ nfs_vinvalbuf(vp, flags, cred, p, intrflg)
* is eventually dequeued by the async daemon, nfs_doio() *will*.
*/
int
-nfs_asyncio(bp, cred)
+nfs_asyncio(bp, cred, procp)
register struct buf *bp;
struct ucred *cred;
+ struct proc *procp;
{
struct nfsmount *nmp;
int i;
@@ -1165,7 +1163,7 @@ again:
error = tsleep(&nmp->nm_bufq, slpflag | PRIBIO,
"nfsaio", slptimeo);
if (error) {
- if (nfs_sigintr(nmp, NULL, bp->b_proc))
+ if (nfs_sigintr(nmp, NULL, procp))
return (EINTR);
if (slpflag == PCATCH) {
slpflag = 0;
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 5170d21..3a9e340 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.126 1999/05/03 20:59:14 alc Exp $
+ * $Id: nfs_vnops.c,v 1.127 1999/05/06 18:13:05 peter Exp $
*/
@@ -2668,7 +2668,7 @@ nfs_strategy(ap)
* otherwise just do it ourselves.
*/
if ((bp->b_flags & B_ASYNC) == 0 ||
- nfs_asyncio(bp, NOCRED))
+ nfs_asyncio(bp, NOCRED, p))
error = nfs_doio(bp, cr, p);
return (error);
}
@@ -3026,7 +3026,7 @@ nfs_bwrite(ap)
struct vnode *a_bp;
} */ *ap;
{
- return (nfs_writebp(ap->a_bp, 1));
+ return (nfs_writebp(ap->a_bp, 1, curproc));
}
/*
@@ -3035,9 +3035,10 @@ nfs_bwrite(ap)
* B_CACHE if this is a VMIO buffer.
*/
int
-nfs_writebp(bp, force)
+nfs_writebp(bp, force, procp)
register struct buf *bp;
int force;
+ struct proc *procp;
{
int s;
int oldflags = bp->b_flags;
@@ -3076,7 +3077,7 @@ nfs_writebp(bp, force)
off = ((u_quad_t)bp->b_blkno) * DEV_BSIZE + bp->b_dirtyoff;
bp->b_flags |= B_WRITEINPROG;
retv = nfs_commit(bp->b_vp, off, bp->b_dirtyend-bp->b_dirtyoff,
- bp->b_wcred, bp->b_proc);
+ bp->b_wcred, procp);
bp->b_flags &= ~B_WRITEINPROG;
if (!retv) {
bp->b_dirtyoff = bp->b_dirtyend = 0;
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 78a54a2..6fd3a89 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.45 1999/02/25 00:03:50 peter Exp $
+ * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
*/
#ifndef _NFS_NFS_H_
@@ -605,7 +605,7 @@ int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
int *));
int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
-int nfs_asyncio __P((struct buf *, struct ucred *));
+int nfs_asyncio __P((struct buf *, struct ucred *, struct proc *));
int nfs_doio __P((struct buf *, struct ucred *, struct proc *));
int nfs_readlinkrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct proc *));
@@ -658,7 +658,7 @@ void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_sort __P((gid_t *, int));
void nfsrv_setcred __P((struct ucred *, struct ucred *));
-int nfs_writebp __P((struct buf *, int));
+int nfs_writebp __P((struct buf *, int, struct proc *));
int nfsrv_object_create __P((struct vnode *));
void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 0d8a782..c7269ef 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.69 1999/04/06 03:07:54 peter Exp $
+ * $Id: nfs_bio.c,v 1.70 1999/05/02 23:56:24 alc Exp $
*/
@@ -465,7 +465,7 @@ nfs_bioread(vp, uio, ioflag, cred)
if ((rabp->b_flags & (B_CACHE|B_DELWRI)) == 0) {
rabp->b_flags |= (B_READ | B_ASYNC);
vfs_busy_pages(rabp, 0);
- if (nfs_asyncio(rabp, cred)) {
+ if (nfs_asyncio(rabp, cred, p)) {
rabp->b_flags |= B_INVAL|B_ERROR;
vfs_unbusy_pages(rabp);
brelse(rabp);
@@ -627,7 +627,7 @@ nfs_bioread(vp, uio, ioflag, cred)
if ((rabp->b_flags & (B_CACHE|B_DELWRI)) == 0) {
rabp->b_flags |= (B_READ | B_ASYNC);
vfs_busy_pages(rabp, 0);
- if (nfs_asyncio(rabp, cred)) {
+ if (nfs_asyncio(rabp, cred, p)) {
rabp->b_flags |= B_INVAL|B_ERROR;
vfs_unbusy_pages(rabp);
brelse(rabp);
@@ -894,7 +894,6 @@ again:
if (bp->b_dirtyend > 0 &&
(on > bp->b_dirtyend || (on + n) < bp->b_dirtyoff)) {
- bp->b_proc = p;
if (VOP_BWRITE(bp) == EINTR)
return (EINTR);
goto again;
@@ -960,7 +959,6 @@ again:
* to turn off caching in this case. Very odd. XXX
*/
if ((np->n_flag & NQNFSNONCACHE) || (ioflag & IO_SYNC)) {
- bp->b_proc = p;
if (ioflag & IO_INVAL)
bp->b_flags |= B_NOCACHE;
error = VOP_BWRITE(bp);
@@ -973,9 +971,8 @@ again:
}
} else if ((n + on) == biosize &&
(nmp->nm_flag & NFSMNT_NQNFS) == 0) {
- bp->b_proc = (struct proc *)0;
bp->b_flags |= B_ASYNC;
- (void)nfs_writebp(bp, 0);
+ (void)nfs_writebp(bp, 0, 0);
} else {
bdwrite(bp);
}
@@ -1097,9 +1094,10 @@ nfs_vinvalbuf(vp, flags, cred, p, intrflg)
* is eventually dequeued by the async daemon, nfs_doio() *will*.
*/
int
-nfs_asyncio(bp, cred)
+nfs_asyncio(bp, cred, procp)
register struct buf *bp;
struct ucred *cred;
+ struct proc *procp;
{
struct nfsmount *nmp;
int i;
@@ -1165,7 +1163,7 @@ again:
error = tsleep(&nmp->nm_bufq, slpflag | PRIBIO,
"nfsaio", slptimeo);
if (error) {
- if (nfs_sigintr(nmp, NULL, bp->b_proc))
+ if (nfs_sigintr(nmp, NULL, procp))
return (EINTR);
if (slpflag == PCATCH) {
slpflag = 0;
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 5170d21..3a9e340 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.126 1999/05/03 20:59:14 alc Exp $
+ * $Id: nfs_vnops.c,v 1.127 1999/05/06 18:13:05 peter Exp $
*/
@@ -2668,7 +2668,7 @@ nfs_strategy(ap)
* otherwise just do it ourselves.
*/
if ((bp->b_flags & B_ASYNC) == 0 ||
- nfs_asyncio(bp, NOCRED))
+ nfs_asyncio(bp, NOCRED, p))
error = nfs_doio(bp, cr, p);
return (error);
}
@@ -3026,7 +3026,7 @@ nfs_bwrite(ap)
struct vnode *a_bp;
} */ *ap;
{
- return (nfs_writebp(ap->a_bp, 1));
+ return (nfs_writebp(ap->a_bp, 1, curproc));
}
/*
@@ -3035,9 +3035,10 @@ nfs_bwrite(ap)
* B_CACHE if this is a VMIO buffer.
*/
int
-nfs_writebp(bp, force)
+nfs_writebp(bp, force, procp)
register struct buf *bp;
int force;
+ struct proc *procp;
{
int s;
int oldflags = bp->b_flags;
@@ -3076,7 +3077,7 @@ nfs_writebp(bp, force)
off = ((u_quad_t)bp->b_blkno) * DEV_BSIZE + bp->b_dirtyoff;
bp->b_flags |= B_WRITEINPROG;
retv = nfs_commit(bp->b_vp, off, bp->b_dirtyend-bp->b_dirtyoff,
- bp->b_wcred, bp->b_proc);
+ bp->b_wcred, procp);
bp->b_flags &= ~B_WRITEINPROG;
if (!retv) {
bp->b_dirtyoff = bp->b_dirtyend = 0;
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 78a54a2..6fd3a89 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.45 1999/02/25 00:03:50 peter Exp $
+ * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
*/
#ifndef _NFS_NFS_H_
@@ -605,7 +605,7 @@ int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
int *));
int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
-int nfs_asyncio __P((struct buf *, struct ucred *));
+int nfs_asyncio __P((struct buf *, struct ucred *, struct proc *));
int nfs_doio __P((struct buf *, struct ucred *, struct proc *));
int nfs_readlinkrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct proc *));
@@ -658,7 +658,7 @@ void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_sort __P((gid_t *, int));
void nfsrv_setcred __P((struct ucred *, struct ucred *));
-int nfs_writebp __P((struct buf *, int));
+int nfs_writebp __P((struct buf *, int, struct proc *));
int nfsrv_object_create __P((struct vnode *));
void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 78a54a2..6fd3a89 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.45 1999/02/25 00:03:50 peter Exp $
+ * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
*/
#ifndef _NFS_NFS_H_
@@ -605,7 +605,7 @@ int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
int *));
int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
-int nfs_asyncio __P((struct buf *, struct ucred *));
+int nfs_asyncio __P((struct buf *, struct ucred *, struct proc *));
int nfs_doio __P((struct buf *, struct ucred *, struct proc *));
int nfs_readlinkrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct proc *));
@@ -658,7 +658,7 @@ void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_sort __P((gid_t *, int));
void nfsrv_setcred __P((struct ucred *, struct ucred *));
-int nfs_writebp __P((struct buf *, int));
+int nfs_writebp __P((struct buf *, int, struct proc *));
int nfsrv_object_create __P((struct vnode *));
void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 78a54a2..6fd3a89 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.45 1999/02/25 00:03:50 peter Exp $
+ * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
*/
#ifndef _NFS_NFS_H_
@@ -605,7 +605,7 @@ int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
int *));
int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
-int nfs_asyncio __P((struct buf *, struct ucred *));
+int nfs_asyncio __P((struct buf *, struct ucred *, struct proc *));
int nfs_doio __P((struct buf *, struct ucred *, struct proc *));
int nfs_readlinkrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct proc *));
@@ -658,7 +658,7 @@ void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_sort __P((gid_t *, int));
void nfsrv_setcred __P((struct ucred *, struct ucred *));
-int nfs_writebp __P((struct buf *, int));
+int nfs_writebp __P((struct buf *, int, struct proc *));
int nfsrv_object_create __P((struct vnode *));
void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 78a54a2..6fd3a89 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.45 1999/02/25 00:03:50 peter Exp $
+ * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
*/
#ifndef _NFS_NFS_H_
@@ -605,7 +605,7 @@ int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
int *));
int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
-int nfs_asyncio __P((struct buf *, struct ucred *));
+int nfs_asyncio __P((struct buf *, struct ucred *, struct proc *));
int nfs_doio __P((struct buf *, struct ucred *, struct proc *));
int nfs_readlinkrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct proc *));
@@ -658,7 +658,7 @@ void nfs_clearcommit __P((struct mount *));
int nfsrv_errmap __P((struct nfsrv_descript *, int));
void nfsrvw_sort __P((gid_t *, int));
void nfsrv_setcred __P((struct ucred *, struct ucred *));
-int nfs_writebp __P((struct buf *, int));
+int nfs_writebp __P((struct buf *, int, struct proc *));
int nfsrv_object_create __P((struct vnode *));
void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 720d063..639a229 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -47,7 +47,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.55 1999/04/27 11:17:57 phk Exp $
+ * $Id: fd.c,v 1.56 1999/05/05 03:43:00 kato Exp $
*
*/
@@ -2609,7 +2609,6 @@ fdformat(dev, finfo, p)
PHOLD(p);
bzero((void *)bp, sizeof(struct buf));
bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
- bp->b_proc = p;
/*
* calculate a fake blkno, so fdstrategy() would initiate a
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index 720d063..639a229 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -47,7 +47,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
- * $Id: fd.c,v 1.55 1999/04/27 11:17:57 phk Exp $
+ * $Id: fd.c,v 1.56 1999/05/05 03:43:00 kato Exp $
*
*/
@@ -2609,7 +2609,6 @@ fdformat(dev, finfo, p)
PHOLD(p);
bzero((void *)bp, sizeof(struct buf));
bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
- bp->b_proc = p;
/*
* calculate a fake blkno, so fdstrategy() would initiate a
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 2c6bd9b..df12c00 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)buf.h 8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.66 1999/05/02 23:56:34 alc Exp $
+ * $Id: buf.h,v 1.67 1999/05/06 17:06:32 phk Exp $
*/
#ifndef _SYS_BUF_H_
@@ -97,7 +97,6 @@ struct buf {
TAILQ_ENTRY(buf) b_vnbufs; /* Buffer's associated vnode. */
TAILQ_ENTRY(buf) b_freelist; /* Free list position if not active. */
TAILQ_ENTRY(buf) b_act; /* Device driver queue when active. *new* */
- struct proc *b_proc; /* Associated proc; NULL if kernel. */
long b_flags; /* B_* flags. */
unsigned short b_qindex; /* buffer queue index */
unsigned char b_usecount; /* buffer use count */
@@ -126,6 +125,8 @@ struct buf {
void *b_saveaddr; /* Original b_addr for physio. */
void *b_driver1; /* for private use by the driver */
void *b_driver2; /* for private use by the driver */
+ void *b_caller1; /* for private use by the driver */
+ void *b_caller2; /* for private use by the driver */
union pager_info {
void *pg_spc;
int pg_reqpage;
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 2c6bd9b..df12c00 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)buf.h 8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.66 1999/05/02 23:56:34 alc Exp $
+ * $Id: buf.h,v 1.67 1999/05/06 17:06:32 phk Exp $
*/
#ifndef _SYS_BUF_H_
@@ -97,7 +97,6 @@ struct buf {
TAILQ_ENTRY(buf) b_vnbufs; /* Buffer's associated vnode. */
TAILQ_ENTRY(buf) b_freelist; /* Free list position if not active. */
TAILQ_ENTRY(buf) b_act; /* Device driver queue when active. *new* */
- struct proc *b_proc; /* Associated proc; NULL if kernel. */
long b_flags; /* B_* flags. */
unsigned short b_qindex; /* buffer queue index */
unsigned char b_usecount; /* buffer use count */
@@ -126,6 +125,8 @@ struct buf {
void *b_saveaddr; /* Original b_addr for physio. */
void *b_driver1; /* for private use by the driver */
void *b_driver2; /* for private use by the driver */
+ void *b_caller1; /* for private use by the driver */
+ void *b_caller2; /* for private use by the driver */
union pager_info {
void *pg_spc;
int pg_reqpage;
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 85837e9..2651be4 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -64,7 +64,7 @@
*
* @(#)swap_pager.c 8.9 (Berkeley) 3/21/94
*
- * $Id: swap_pager.c,v 1.116 1999/02/21 08:34:15 dillon Exp $
+ * $Id: swap_pager.c,v 1.117 1999/03/14 09:20:00 julian Exp $
*/
#include <sys/param.h>
@@ -1110,8 +1110,7 @@ swap_pager_getpages(object, m, count, reqpage)
bp->b_flags = B_BUSY | B_READ | B_CALL;
bp->b_iodone = swp_pager_async_iodone;
- bp->b_proc = &proc0; /* XXX (but without B_PHYS set this is ok) */
- bp->b_rcred = bp->b_wcred = bp->b_proc->p_ucred;
+ bp->b_rcred = bp->b_wcred = proc0.p_ucred;
bp->b_data = (caddr_t) kva;
crhold(bp->b_rcred);
crhold(bp->b_wcred);
@@ -1368,8 +1367,7 @@ swap_pager_putpages(object, m, count, sync, rtvals)
pmap_qenter((vm_offset_t)bp->b_data, &m[i], n);
- bp->b_proc = &proc0; /* XXX (but without B_PHYS this is ok) */
- bp->b_rcred = bp->b_wcred = bp->b_proc->p_ucred;
+ bp->b_rcred = bp->b_wcred = proc0.p_ucred;
bp->b_bcount = PAGE_SIZE * n;
bp->b_bufsize = PAGE_SIZE * n;
bp->b_blkno = blk;
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index dbacceb..9055003 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_pager.c,v 1.45 1999/04/11 02:16:27 eivind Exp $
+ * $Id: vm_pager.c,v 1.46 1999/05/02 23:57:14 alc Exp $
*/
/*
@@ -540,9 +540,7 @@ getchainbuf(struct buf *bp, struct vnode *vp, int flags)
waitchainbuf(bp, 4, 0);
nbp->b_flags = B_BUSY | B_CALL | (bp->b_flags & B_ORDERED) | flags;
- nbp->b_proc = &proc0;
- nbp->b_rcred = nbp->b_proc->p_ucred;
- nbp->b_wcred = nbp->b_proc->p_ucred;
+ nbp->b_rcred = nbp->b_wcred = proc0.p_ucred;
nbp->b_iodone = vm_pager_chain_iodone;
crhold(nbp->b_rcred);
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 83f379a..023a601 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91
- * $Id: vnode_pager.c,v 1.107 1999/04/10 20:52:11 dt Exp $
+ * $Id: vnode_pager.c,v 1.108 1999/05/02 23:57:16 alc Exp $
*/
/*
@@ -409,8 +409,7 @@ vnode_pager_input_smlfs(object, m)
/* build a minimal buffer header */
bp->b_flags = B_BUSY | B_READ | B_CALL;
bp->b_iodone = vnode_pager_iodone;
- bp->b_proc = curproc;
- bp->b_rcred = bp->b_wcred = bp->b_proc->p_ucred;
+ bp->b_rcred = bp->b_wcred = curproc->p_ucred;
if (bp->b_rcred != NOCRED)
crhold(bp->b_rcred);
if (bp->b_wcred != NOCRED)
@@ -726,8 +725,7 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
bp->b_flags = B_BUSY | B_READ | B_CALL;
bp->b_iodone = vnode_pager_iodone;
/* B_PHYS is not set, but it is nice to fill this in */
- bp->b_proc = curproc;
- bp->b_rcred = bp->b_wcred = bp->b_proc->p_ucred;
+ bp->b_rcred = bp->b_wcred = curproc->p_ucred;
if (bp->b_rcred != NOCRED)
crhold(bp->b_rcred);
if (bp->b_wcred != NOCRED)
OpenPOWER on IntegriCloud