From 893b54638f3a661ae9e6e7bc8dfa12746f83e031 Mon Sep 17 00:00:00 2001 From: alc Date: Fri, 20 Jun 2003 04:20:36 +0000 Subject: The so-called "optimized copy-on-write fault" case should not require the vm map lock. What's really needed is vm object locking, which is (for the moment) provided Giant. Reviewed by: tegge --- sys/vm/vm_fault.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'sys/vm') diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 176716d..cc138c3 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -683,7 +683,7 @@ readrest: * dirty in the first object so that it will go out * to swap when needed. */ - if (map_generation == fs.map->timestamp && + if ( /* * Only one shadow object */ @@ -704,14 +704,7 @@ readrest: /* * We don't chase down the shadow chain */ - (fs.object == fs.first_object->backing_object) && - - /* - * grab the lock if we need to - */ - (fs.lookup_still_valid || vm_map_trylock(fs.map))) { - - fs.lookup_still_valid = 1; + fs.object == fs.first_object->backing_object) { /* * get rid of the unnecessary page */ -- cgit v1.1