From a89c6258bbcd94de26be488dcd7e9bbb75f67dac Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 3 Nov 2003 00:59:54 +0000 Subject: [PATCH] - Increase the scope of the source object lock in vm_map_copy_entry(). --- sys/vm/vm_map.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 956d048bc01..021a8163120 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);