[src/chs-ubc2]: src/sys/uvm in uvn_findpage(), ignore any offsets where the r...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f380a59e01bb
branches:  chs-ubc2
changeset: 471414:f380a59e01bb
user:      chs <chs%NetBSD.org@localhost>
date:      Sat Jul 31 19:04:49 1999 +0000

description:
in uvn_findpage(), ignore any offsets where the return page pointer
is non-NULL.

diffstat:

 sys/uvm/uvm_vnode.c |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (38 lines):

diff -r 02870a975e03 -r f380a59e01bb sys/uvm/uvm_vnode.c
--- a/sys/uvm/uvm_vnode.c       Sat Jul 31 19:03:26 1999 +0000
+++ b/sys/uvm/uvm_vnode.c       Sat Jul 31 19:04:49 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_vnode.c,v 1.22.2.1.2.3 1999/07/11 05:47:13 chs Exp $       */
+/*     $NetBSD: uvm_vnode.c,v 1.22.2.1.2.4 1999/07/31 19:04:49 chs Exp $       */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -970,6 +970,9 @@
 
                s = splbio();
                while (vp->v_numoutput != 0) {
+                       UVMHIST_LOG(ubchist, "waiting for vp %p num %d",
+                                   vp, vp->v_numoutput,0,0);
+
                        vp->v_flag |= VBWAIT;
                        UVM_UNLOCK_AND_WAIT(&vp->v_numoutput,
                                            &uvn->u_obj.vmobjlock, 
@@ -1106,17 +1109,10 @@
        UVMHIST_LOG(ubchist, "vp %p off 0x%lx", uobj, offset,0,0);
 
        simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
-
-       if (*pps == PGO_DONTCARE) {
+       if (*pps != NULL) {
                UVMHIST_LOG(ubchist, "dontcare", 0,0,0,0);
                return 0;
        }
-#ifdef DIAGNOTISTIC
-       if (*pps != NULL) {
-               panic("uvn_findpage: *pps not NULL");
-       }
-#endif
-
        for (;;) {
                /* look for an existing page */
                ptmp = uvm_pagelookup(uobj, offset);