Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177848278
D22747.1795423597.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D22747.1795423597.diff
View Options
Index: head/sys/vm/vm_map.c
===================================================================
--- head/sys/vm/vm_map.c
+++ head/sys/vm/vm_map.c
@@ -3870,15 +3870,19 @@
int charged;
src_object = src_entry->object.vm_object;
- VM_OBJECT_WLOCK(src_object);
charged = ENTRY_CHARGED(src_entry);
- vm_object_collapse(src_object);
- if ((src_object->flags & OBJ_ONEMAPPING) != 0) {
- vm_object_split(src_entry);
- src_object = src_entry->object.vm_object;
- }
- vm_object_reference_locked(src_object);
- vm_object_clear_flag(src_object, OBJ_ONEMAPPING);
+ if ((src_object->flags & OBJ_ANON) != 0) {
+ VM_OBJECT_WLOCK(src_object);
+ vm_object_collapse(src_object);
+ if ((src_object->flags & OBJ_ONEMAPPING) != 0) {
+ vm_object_split(src_entry);
+ src_object = src_entry->object.vm_object;
+ }
+ vm_object_reference_locked(src_object);
+ vm_object_clear_flag(src_object, OBJ_ONEMAPPING);
+ VM_OBJECT_WUNLOCK(src_object);
+ } else
+ vm_object_reference(src_object);
if (src_entry->cred != NULL &&
!(src_entry->eflags & MAP_ENTRY_NEEDS_COPY)) {
KASSERT(src_object->cred == NULL,
@@ -3887,7 +3891,6 @@
src_object->cred = src_entry->cred;
src_object->charge = size;
}
- VM_OBJECT_WUNLOCK(src_object);
dst_entry->object.vm_object = src_object;
if (charged) {
cred = curthread->td_ucred;
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 23, 8:46 AM (23 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41926537
Default Alt Text
D22747.1795423597.diff (1 KB)
Attached To
Mode
D22747: In vm_map_copy_swap_object the object lock is not needed to protect charge/ucred because they are protected by the map lock.
Attached
Detach File
Event Timeline