[src/trunk]: src/sys/uvm g/c unused pager ops "asyncget" and "aiodone".

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

details:   https://anonhg.NetBSD.org/src/rev/930f496945ac
branches:  trunk
changeset: 499618:930f496945ac
user:      chs <chs%NetBSD.org@localhost>
date:      Fri Nov 24 20:34:01 2000 +0000

description:
g/c unused pager ops "asyncget" and "aiodone".

diffstat:

 sys/uvm/uvm_aobj.c   |   4 +---
 sys/uvm/uvm_device.c |  47 +----------------------------------------------
 sys/uvm/uvm_pager.h  |   6 +-----
 sys/uvm/uvm_vnode.c  |  28 +---------------------------
 4 files changed, 4 insertions(+), 81 deletions(-)

diffs (181 lines):

diff -r ef428a10c8fc -r 930f496945ac sys/uvm/uvm_aobj.c
--- a/sys/uvm/uvm_aobj.c        Fri Nov 24 19:51:39 2000 +0000
+++ b/sys/uvm/uvm_aobj.c        Fri Nov 24 20:34:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_aobj.c,v 1.35 2000/11/08 14:28:16 ad Exp $ */
+/*     $NetBSD: uvm_aobj.c,v 1.36 2000/11/24 20:34:01 chs Exp $        */
 
 /*
  * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -198,11 +198,9 @@
        NULL,                   /* fault */
        uao_flush,              /* flush */
        uao_get,                /* get */
-       NULL,                   /* asyncget */
        NULL,                   /* put (done by pagedaemon) */
        NULL,                   /* cluster */
        NULL,                   /* mk_pcluster */
-       NULL,                   /* aiodone */
        uao_releasepg           /* releasepg */
 };
 
diff -r ef428a10c8fc -r 930f496945ac sys/uvm/uvm_device.c
--- a/sys/uvm/uvm_device.c      Fri Nov 24 19:51:39 2000 +0000
+++ b/sys/uvm/uvm_device.c      Fri Nov 24 20:34:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_device.c,v 1.28 2000/06/27 17:29:20 mrg Exp $      */
+/*     $NetBSD: uvm_device.c,v 1.29 2000/11/24 20:34:01 chs Exp $      */
 
 /*
  *
@@ -70,12 +70,8 @@
 static int             udv_fault __P((struct uvm_faultinfo *, vaddr_t,
                                       vm_page_t *, int, int, vm_fault_t,
                                       vm_prot_t, int));
-static int             udv_asyncget __P((struct uvm_object *, voff_t,
-                                      int));
 static boolean_t        udv_flush __P((struct uvm_object *, voff_t, voff_t,
                                       int));
-static int             udv_put __P((struct uvm_object *, vm_page_t *,
-                                       int, boolean_t));
 
 /*
  * master pager structure
@@ -87,13 +83,6 @@
        udv_detach,
        udv_fault,
        udv_flush,
-       NULL,           /* no get function since we have udv_fault */
-       udv_asyncget,
-       udv_put,
-       NULL,           /* no cluster function */
-       NULL,           /* no put cluster function */
-       NULL,           /* no AIO-DONE function since no async i/o */
-       NULL,           /* no releasepg function since no normal pages */
 };
 
 /*
@@ -495,37 +484,3 @@
        uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj, NULL);
        return (retval);
 }
-
-/*
- * udv_asyncget: start async I/O to bring pages into ram
- *
- * => caller must lock object(???XXX: see if this is best)
- * => a no-op for devices
- */
-
-static int
-udv_asyncget(uobj, offset, npages)
-       struct uvm_object *uobj;
-       voff_t offset;
-       int npages;
-{
-
-       return(KERN_SUCCESS);
-}
-
-/*
- * udv_put: flush page data to backing store.
- *
- * => this function should never be called (since we never have any
- *     page structures to "put")
- */
-
-static int
-udv_put(uobj, pps, npages, flags)
-       struct uvm_object *uobj;
-       struct vm_page **pps;
-       int npages, flags;
-{
-
-       panic("udv_put: trying to page out to a device!");
-}
diff -r ef428a10c8fc -r 930f496945ac sys/uvm/uvm_pager.h
--- a/sys/uvm/uvm_pager.h       Fri Nov 24 19:51:39 2000 +0000
+++ b/sys/uvm/uvm_pager.h       Fri Nov 24 20:34:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_pager.h,v 1.16 2000/06/26 14:21:18 mrg Exp $       */
+/*     $NetBSD: uvm_pager.h,v 1.17 2000/11/24 20:34:01 chs Exp $       */
 
 /*
  *
@@ -115,8 +115,6 @@
        int                     (*pgo_get)      /* get/read page */
                         __P((struct uvm_object *, voff_t,
                                 vm_page_t *, int *, int, vm_prot_t, int, int));
-       int                     (*pgo_asyncget) /* start async get */
-                        __P((struct uvm_object *, voff_t, int));
        int                     (*pgo_put)      /* put/write page */
                         __P((struct uvm_object *, vm_page_t *, 
                                 int, boolean_t));
@@ -127,8 +125,6 @@
                         __P((struct uvm_object *, struct vm_page **,
                                 int *, struct vm_page *, int, voff_t,
                                 voff_t));
-       void                    (*pgo_aiodone)          /* async iodone */
-                        __P((struct uvm_aiodesc *));
        boolean_t               (*pgo_releasepg)        /* release page */
                         __P((struct vm_page *, struct vm_page **));
 };
diff -r ef428a10c8fc -r 930f496945ac sys/uvm/uvm_vnode.c
--- a/sys/uvm/uvm_vnode.c       Fri Nov 24 19:51:39 2000 +0000
+++ b/sys/uvm/uvm_vnode.c       Fri Nov 24 20:34:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_vnode.c,v 1.35 2000/06/27 17:29:37 mrg Exp $       */
+/*     $NetBSD: uvm_vnode.c,v 1.36 2000/11/24 20:34:01 chs Exp $       */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -86,8 +86,6 @@
  * functions
  */
 
-static int                uvn_asyncget __P((struct uvm_object *, voff_t,
-                                           int));
 static void               uvn_cluster __P((struct uvm_object *, voff_t,
                                           voff_t *, voff_t *));
 static void                uvn_detach __P((struct uvm_object *));
@@ -116,11 +114,9 @@
        NULL,                   /* no specialized fault routine required */
        uvn_flush,
        uvn_get,
-       uvn_asyncget,
        uvn_put,
        uvn_cluster,
        uvm_mk_pcluster, /* use generic version of this: see uvm_pager.c */
-       NULL,            /* AIO-DONE function (not until we have asyncio) */
        uvn_releasepg,
 };
 
@@ -1548,28 +1544,6 @@
 }
 
 /*
- * uvn_asyncget: start async I/O to bring pages into ram
- *
- * => caller must lock object(???XXX: see if this is best)
- * => could be called from uvn_get or a madvise() fault-ahead.
- * => if it fails, it doesn't matter.
- */
-
-static int
-uvn_asyncget(uobj, offset, npages)
-       struct uvm_object *uobj;
-       voff_t offset;
-       int npages;
-{
-
-       /*
-        * XXXCDC: we can't do async I/O yet
-        */
-       printf("uvn_asyncget called\n");
-       return (KERN_SUCCESS);
-}
-
-/*
  * uvn_io: do I/O to a vnode
  *
  * => prefer map unlocked (not required)