[src/chs-ubc2]: src/sys/uvm Update from trunk.

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

details:   https://anonhg.NetBSD.org/src/rev/6c63915c73f9
branches:  chs-ubc2
changeset: 471448:6c63915c73f9
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Aug 02 23:39:29 1999 +0000

description:
Update from trunk.

diffstat:

 sys/uvm/uvm_fault.c |  33 +--------------------------------
 sys/uvm/uvm_vnode.c |   8 +-------
 2 files changed, 2 insertions(+), 39 deletions(-)

diffs (177 lines):

diff -r ef57115824ca -r 6c63915c73f9 sys/uvm/uvm_fault.c
--- a/sys/uvm/uvm_fault.c       Mon Aug 02 23:37:04 1999 +0000
+++ b/sys/uvm/uvm_fault.c       Mon Aug 02 23:39:29 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_fault.c,v 1.27.2.1.2.4 1999/08/02 23:16:14 thorpej Exp $   */
+/*     $NetBSD: uvm_fault.c,v 1.27.2.1.2.5 1999/08/02 23:39:29 thorpej Exp $   */
 
 /*
  *
@@ -885,7 +885,6 @@
                                    PGO_LOCKED|PGO_SYNCIO);
 
                /* locked: nothing, pgo_fault has unlocked everything */
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_UNLOCKED);
 
                if (result == VM_PAGER_OK)
                        return (KERN_SUCCESS);  /* pgo_fault did pmap enter */
@@ -921,8 +920,6 @@
                                access_type & MASK(ufi.entry),
                                ufi.entry->advice, PGO_LOCKED);
 
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
-
                /*
                 * check for pages to map, if we got any
                 */
@@ -998,7 +995,6 @@
                }   /* "gotpages" != 0 */
 
                /* note: object still _locked_ */
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
        } else {
                
                uobjpage = NULL;
@@ -1043,9 +1039,6 @@
 
        /* locked: maps(read), amap, anon */
 
-       simple_lock_assert(&amap->am_l, SLOCK_LOCKED);
-       simple_lock_assert(&anon->an_lock, SLOCK_LOCKED);
-
        /*
         * no matter if we have case 1A or case 1B we are going to need to
         * have the anon's memory resident.   ensure that now.
@@ -1079,11 +1072,6 @@
        uobj = anon->u.an_page->uobject;        /* locked by anonget if !NULL */
 
        /* locked: maps(read), amap, anon, uobj(if one) */
-       simple_lock_assert(&amap->am_l, SLOCK_LOCKED);
-       simple_lock_assert(&anon->an_lock, SLOCK_LOCKED);
-       if (uobj) {
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
-       }
 
        /*
         * special handling for loaned pages 
@@ -1236,8 +1224,6 @@
        }
 
        /* locked: maps(read), amap, oanon */
-       simple_lock_assert(&amap->am_l, SLOCK_LOCKED);
-       simple_lock_assert(&oanon->an_lock, SLOCK_LOCKED);
 
        /*
         * now map the page in ...
@@ -1293,9 +1279,6 @@
         * locked:
         * maps(read), amap(if there), uobj(if !null), uobjpage(if !null)
         */
-       if (uobj) {
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
-       }
 
        /*
         * note that uobjpage can not be PGO_DONTCARE at this point.  we now
@@ -1334,7 +1317,6 @@
                /* locked: maps(read), amap(if there), uobj */
                uvmfault_unlockall(&ufi, amap, NULL, NULL);
                /* locked: uobj */
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
 
                uvmexp.fltget++;
                gotpages = 1;
@@ -1344,7 +1326,6 @@
                    PGO_SYNCIO);
 
                /* locked: uobjpage(if result OK) */
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_UNLOCKED);
 
                /*
                 * recover from I/O
@@ -1384,7 +1365,6 @@
                
                /* locked(locked): maps(read), amap(if !null), uobj, uobjpage */
                /* locked(!locked): uobj, uobjpage */
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
 
                /*
                 * verify that the page has not be released and re-verify
@@ -1446,19 +1426,12 @@
                 */
 
                /* locked: maps(read), amap(if !null), uobj, uobjpage */
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
        }
 
        /*
         * locked:
         * maps(read), amap(if !null), uobj(if !null), uobjpage(if uobj)
         */
-       if (amap) {
-               simple_lock_assert(&amap->am_l, SLOCK_LOCKED);
-       }
-       if (uobj) {
-               simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
-       }
 
        /*
         * notes:
@@ -1597,8 +1570,6 @@
                         */
                        if (uobjpage != PGO_DONTCARE) {
                                /* still holding object lock */
-                               simple_lock_assert(&uobj->vmobjlock,
-                                                  SLOCK_LOCKED);
 
                                if (uobjpage->flags & PG_WANTED)
                                        /* still holding object lock */
@@ -1639,8 +1610,6 @@
                 */
 
                if (uobjpage != PGO_DONTCARE) {
-                       simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
-
                        uvmexp.flt_prcopy++;
                        /* copy page [pg now dirty] */
                        uvm_pagecopy(uobjpage, pg);
diff -r ef57115824ca -r 6c63915c73f9 sys/uvm/uvm_vnode.c
--- a/sys/uvm/uvm_vnode.c       Mon Aug 02 23:37:04 1999 +0000
+++ b/sys/uvm/uvm_vnode.c       Mon Aug 02 23:39:29 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_vnode.c,v 1.22.2.1.2.4 1999/07/31 19:04:49 chs Exp $       */
+/*     $NetBSD: uvm_vnode.c,v 1.22.2.1.2.5 1999/08/02 23:39:29 thorpej Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -1028,10 +1028,8 @@
 
        sync = (flags & PGO_SYNCIO) ? 1 : 0;
 
-       simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
        simple_unlock(&uobj->vmobjlock);
        error = VOP_PUTPAGES(vp, pps, npages, sync, NULL);
-       simple_lock_assert(&uobj->vmobjlock, SLOCK_UNLOCKED);
 
        return uvm_errno2vmerror(error);
 }
@@ -1063,11 +1061,8 @@
        UVMHIST_FUNC("uvn_get"); UVMHIST_CALLED(ubchist);
        UVMHIST_LOG(ubchist, "vp %p off 0x%x", vp, (int)offset, 0,0);
 
-       simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
        error = VOP_GETPAGES(vp, offset, pps, npagesp, centeridx,
                             access_type, advice, flags);
-       simple_lock_assert(&uobj->vmobjlock, flags & PGO_LOCKED ?
-                          SLOCK_LOCKED : SLOCK_UNLOCKED);
        return uvm_errno2vmerror(error);
 }
 
@@ -1108,7 +1103,6 @@
        UVMHIST_FUNC("uvn_findpage"); UVMHIST_CALLED(ubchist);
        UVMHIST_LOG(ubchist, "vp %p off 0x%lx", uobj, offset,0,0);
 
-       simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
        if (*pps != NULL) {
                UVMHIST_LOG(ubchist, "dontcare", 0,0,0,0);
                return 0;