[src/trunk]: src/sys/uvm uvm_fault: check a correct object in the case of lay...

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

details:   https://anonhg.NetBSD.org/src/rev/f98d25d3fb3f
branches:  trunk
changeset: 583184:f98d25d3fb3f
user:      yamt <yamt%NetBSD.org@localhost>
date:      Fri Jul 22 14:57:39 2005 +0000

description:
uvm_fault: check a correct object in the case of layered filesystems.
fix PR/30811 from Jukka Salmi.

diffstat:

 sys/uvm/uvm_fault.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 9dfe79c127f2 -r f98d25d3fb3f sys/uvm/uvm_fault.c
--- a/sys/uvm/uvm_fault.c       Fri Jul 22 14:27:08 2005 +0000
+++ b/sys/uvm/uvm_fault.c       Fri Jul 22 14:57:39 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_fault.c,v 1.96 2005/07/17 12:27:47 yamt Exp $      */
+/*     $NetBSD: uvm_fault.c,v 1.97 2005/07/22 14:57:39 yamt Exp $      */
 
 /*
  *
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.96 2005/07/17 12:27:47 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.97 2005/07/22 14:57:39 yamt Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -962,11 +962,11 @@
                                 */
                                KASSERT((curpg->flags & PG_PAGEOUT) == 0);
                                KASSERT((curpg->flags & PG_RELEASED) == 0);
-                               KASSERT(!UVM_OBJ_IS_CLEAN(uobj) ||
+                               KASSERT(!UVM_OBJ_IS_CLEAN(curpg->uobject) ||
                                    (curpg->flags & PG_CLEAN) != 0);
                                readonly = (curpg->flags & PG_RDONLY)
                                    || (curpg->loan_count > 0)
-                                   || UVM_OBJ_IS_CLEAN(uobj);
+                                   || UVM_OBJ_IS_CLEAN(curpg->uobject);
 
                                (void) pmap_enter(ufi.orig_map->pmap, currva,
                                    VM_PAGE_TO_PHYS(curpg),
@@ -1442,7 +1442,7 @@
         *  - at this point uobjpage could be PG_WANTED (handle later)
         */
 
-       KASSERT(uobj == NULL || !UVM_OBJ_IS_CLEAN(uobj) ||
+       KASSERT(uobj == NULL || !UVM_OBJ_IS_CLEAN(uobjpage->uobject) ||
            (uobjpage->flags & PG_CLEAN) != 0);
        if (promote == FALSE) {
 
@@ -1460,7 +1460,7 @@
 
                uvmexp.flt_obj++;
                if (UVM_ET_ISCOPYONWRITE(ufi.entry) ||
-                   UVM_OBJ_IS_CLEAN(uobj))
+                   UVM_OBJ_IS_CLEAN(uobjpage->uobject))
                        enter_prot &= ~VM_PROT_WRITE;
                pg = uobjpage;          /* map in the actual object */