[src/chs-ubc2]: src/sys/uvm remove uvm_vnp_uncache(), it's not needed anymore.

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

details:   https://anonhg.NetBSD.org/src/rev/de03607bcee7
branches:  chs-ubc2
changeset: 471390:de03607bcee7
user:      chs <chs%NetBSD.org@localhost>
date:      Sun Jul 11 05:47:13 1999 +0000

description:
remove uvm_vnp_uncache(), it's not needed anymore.
use uvm_errno2vmerror().
put uvm_vnp_zerorange() back the way it was before,
it was right the first time.

diffstat:

 sys/uvm/uvm_vnode.c |  53 +++++++++++++++++++++++------------------------------
 1 files changed, 23 insertions(+), 30 deletions(-)

diffs (111 lines):

diff -r 354fe13ea705 -r de03607bcee7 sys/uvm/uvm_vnode.c
--- a/sys/uvm/uvm_vnode.c       Sun Jul 11 05:43:56 1999 +0000
+++ b/sys/uvm/uvm_vnode.c       Sun Jul 11 05:47:13 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_vnode.c,v 1.22.2.1.2.2 1999/07/04 02:08:14 chs Exp $       */
+/*     $NetBSD: uvm_vnode.c,v 1.22.2.1.2.3 1999/07/11 05:47:13 chs Exp $       */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -1009,7 +1009,6 @@
 /*
  * uvn_put: flush page data to backing store.
  *
- * => prefer map unlocked (not required)
  * => object must be locked!   we will _unlock_ it before starting I/O.
  * => flags: PGO_SYNCIO -- use sync. I/O
  * => note: caller must set PG_CLEAN and pmap_clear_modify (if needed)
@@ -1021,16 +1020,17 @@
        struct vm_page **pps;
        int npages, flags;
 {
-       int retval, sync;
+       struct vnode *vp = (struct vnode *)uobj;
+       int error, sync;
 
        sync = (flags & PGO_SYNCIO) ? 1 : 0;
 
        simple_lock_assert(&uobj->vmobjlock, SLOCK_LOCKED);
        simple_unlock(&uobj->vmobjlock);
-       retval = VOP_PUTPAGES((struct vnode *)uobj, pps, npages, sync, &retval);
+       error = VOP_PUTPAGES(vp, pps, npages, sync, NULL);
        simple_lock_assert(&uobj->vmobjlock, SLOCK_UNLOCKED);
 
-       return(retval);
+       return uvm_errno2vmerror(error);
 }
 
 
@@ -1051,8 +1051,9 @@
        vaddr_t offset;
        struct vm_page **pps;           /* IN/OUT */
        int *npagesp;                   /* IN (OUT if PGO_LOCKED) */
-       int centeridx, advice, flags;
+       int centeridx;
        vm_prot_t access_type;
+       int advice, flags;
 {
        struct vnode *vp = (struct vnode *)uobj;
        int error;
@@ -1064,7 +1065,7 @@
                             access_type, advice, flags);
        simple_lock_assert(&uobj->vmobjlock, flags & PGO_LOCKED ?
                           SLOCK_LOCKED : SLOCK_UNLOCKED);
-       return error ? VM_PAGER_ERROR : VM_PAGER_OK;
+       return uvm_errno2vmerror(error);
 }
 
 /*
@@ -1194,13 +1195,6 @@
        return (KERN_SUCCESS);
 }
 
-boolean_t
-uvm_vnp_uncache(vp)
-       struct vnode *vp;
-{
-       return(TRUE);
-}
-
 /*
  * uvm_vnp_setsize: grow or shrink a vnode uvn
  *
@@ -1380,23 +1374,22 @@
        off_t off;
        size_t len;
 {
-       struct uvm_object *uobj = &vp->v_uvm.u_obj;
-       off_t pagestart = trunc_page(off);
-       off_t pageend = round_page(off + len);
-       int npages = (pageend - pagestart) >> PAGE_SHIFT;
-       struct vm_page *pgs[npages];
-       char *cp;
+        void *win;
+
+        /*
+         * XXX invent kzero() and use it
+         */
 
-       memset(pgs, 0, sizeof(pgs));
-       simple_lock(&uobj->vmobjlock);
-       uvn_findpages(uobj, (vaddr_t)pagestart, &npages, pgs, 0);
-       simple_unlock(&uobj->vmobjlock);
-       cp = (char *)uvm_pagermapin(pgs, npages, M_WAITOK);
-       memset(cp + (off - pagestart), 0, len);
-       uvm_pagermapout((vaddr_t)cp, npages);
-       simple_lock(&uobj->vmobjlock);
-       uvm_pager_dropcluster(uobj, NULL, pgs, &npages, 0, 0);
-       simple_unlock(&uobj->vmobjlock);
+        while (len) {
+                vsize_t bytelen = len;
+
+                win = ubc_alloc(&vp->v_uvm.u_obj, off, &bytelen, UBC_WRITE);
+                memset(win, 0, bytelen);
+                ubc_release(win, 0);
+
+                off += bytelen;
+                len -= bytelen;
+        }
 }
 
 /*