diff options
author | alc <alc@FreeBSD.org> | 2003-11-03 00:59:54 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 2003-11-03 00:59:54 +0000 |
commit | 1903f6228a16fbb0506e7117500460664d211c93 (patch) | |
tree | 6d31eb73000165a893e1503006626445c41dadaa /sys/vm/vm_map.c | |
parent | 643bf22b592359e06d5e1dacdce6c1f22275ead8 (diff) | |
download | FreeBSD-src-1903f6228a16fbb0506e7117500460664d211c93.zip FreeBSD-src-1903f6228a16fbb0506e7117500460664d211c93.tar.gz |
- Increase the scope of the source object lock in vm_map_copy_entry().
Diffstat (limited to 'sys/vm/vm_map.c')
-rw-r--r-- | sys/vm/vm_map.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 956d048..021a816 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2356,20 +2356,18 @@ vm_map_copy_entry( * Make a copy of the object. */ if ((src_object = src_entry->object.vm_object) != NULL) { - + VM_OBJECT_LOCK(src_object); if ((src_object->handle == NULL) && (src_object->type == OBJT_DEFAULT || src_object->type == OBJT_SWAP)) { - VM_OBJECT_LOCK(src_object); vm_object_collapse(src_object); - VM_OBJECT_UNLOCK(src_object); if ((src_object->flags & (OBJ_NOSPLIT|OBJ_ONEMAPPING)) == OBJ_ONEMAPPING) { + VM_OBJECT_UNLOCK(src_object); vm_object_split(src_entry); src_object = src_entry->object.vm_object; + VM_OBJECT_LOCK(src_object); } } - - VM_OBJECT_LOCK(src_object); vm_object_reference_locked(src_object); vm_object_clear_flag(src_object, OBJ_ONEMAPPING); VM_OBJECT_UNLOCK(src_object); |