summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2001-11-29 02:08:23 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2001-11-29 02:08:23 +0000
commitaafd1bdc0e7f44706a6c05a547e0227505c7781a (patch)
tree129e9adfb013c7329981492b86473d339f0fef7b
parent9cc42e5abb54cc95f0b1a1c58a0f0119d2cfc0f2 (diff)
Make sure the whole buffer is initialized before calling bgetvp.
Recommended by csapuntz@
-rw-r--r--sys/kern/vfs_default.c6
-rw-r--r--sys/nfs/nfs_bio.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 89b1edee6a6..d008aba0629 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_default.c,v 1.9 2001/11/29 01:58:57 art Exp $ */
+/* $OpenBSD: vfs_default.c,v 1.10 2001/11/29 02:08:21 art Exp $ */
/*
* Portions of this code are:
@@ -530,8 +530,8 @@ genfs_getpages(v)
mbp->b_flags = B_BUSY|B_READ| (async ? B_CALL : 0);
mbp->b_iodone = uvm_aio_biodone;
mbp->b_vp = NULL;
- bgetvp(vp, mbp);
LIST_INIT(&mbp->b_dep);
+ bgetvp(vp, mbp);
/*
* if EOF is in the middle of the range, zero the part past EOF.
@@ -892,8 +892,8 @@ genfs_putpages(v)
(curproc == uvm.pagedaemon_proc ? B_PDAEMON : 0);
mbp->b_iodone = uvm_aio_biodone;
mbp->b_vp = NULL;
- bgetvp(vp, mbp);
LIST_INIT(&mbp->b_dep);
+ bgetvp(vp, mbp);
bp = NULL;
for (offset = startoffset;
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 74c994def2a..70b682b548b 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_bio.c,v 1.26 2001/11/29 01:59:19 art Exp $ */
+/* $OpenBSD: nfs_bio.c,v 1.27 2001/11/29 02:08:22 art Exp $ */
/* $NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $ */
/*
@@ -758,9 +758,9 @@ nfs_getpages(v)
mbp->b_flags = B_BUSY|B_READ| (async ? B_CALL|B_ASYNC : 0);
mbp->b_iodone = uvm_aio_biodone;
mbp->b_vp = NULL;
- bgetvp(vp, mbp);
mbp->b_proc = NULL; /* XXXUBC */
LIST_INIT(&mbp->b_dep);
+ bgetvp(vp, mbp);
/*
* if EOF is in the middle of the last page, zero the part past EOF.
@@ -1052,9 +1052,9 @@ nfs_putpages(v)
(curproc == uvm.pagedaemon_proc ? B_PDAEMON : 0);
mbp->b_iodone = uvm_aio_biodone;
mbp->b_vp = NULL;
- bgetvp(vp, mbp);
mbp->b_proc = NULL; /* XXXUBC */
LIST_INIT(&mbp->b_dep);
+ bgetvp(vp, mbp);
for (offset = origoffset;
bytes > 0;