Changeset View
Changeset View
Standalone View
Standalone View
sys/vm/vm_map.c
Show First 20 Lines • Show All 4,093 Lines • ▼ Show 20 Lines | vmspace_fork(struct vmspace *vm1, vm_ooffset_t *fork_charge) | ||||
vm2->vm_maxsaddr = vm1->vm_maxsaddr; | vm2->vm_maxsaddr = vm1->vm_maxsaddr; | ||||
vm_map_lock(old_map); | vm_map_lock(old_map); | ||||
if (old_map->busy) | if (old_map->busy) | ||||
vm_map_wait_busy(old_map); | vm_map_wait_busy(old_map); | ||||
new_map = &vm2->vm_map; | new_map = &vm2->vm_map; | ||||
locked = vm_map_trylock(new_map); /* trylock to silence WITNESS */ | locked = vm_map_trylock(new_map); /* trylock to silence WITNESS */ | ||||
KASSERT(locked, ("vmspace_fork: lock failed")); | KASSERT(locked, ("vmspace_fork: lock failed")); | ||||
error = pmap_vmspace_copy(new_map->pmap, old_map->pmap); | error = pmap_vmspace_copy(new_map->pmap, old_map->pmap); | ||||
kib: () are excessive.
Also I suggest to move the line right after new_map assignment (line 4098)… | |||||
if (error != 0) { | if (error != 0) { | ||||
sx_xunlock(&old_map->lock); | sx_xunlock(&old_map->lock); | ||||
sx_xunlock(&new_map->lock); | sx_xunlock(&new_map->lock); | ||||
vm_map_process_deferred(); | vm_map_process_deferred(); | ||||
vmspace_free(vm2); | vmspace_free(vm2); | ||||
return (NULL); | return (NULL); | ||||
} | } | ||||
new_map->anon_loc = old_map->anon_loc; | new_map->anon_loc = old_map->anon_loc; | ||||
new_map->flags |= old_map->flags & (MAP_ASLR | MAP_ASLR_IGNSTART); | |||||
VM_MAP_ENTRY_FOREACH(old_entry, old_map) { | VM_MAP_ENTRY_FOREACH(old_entry, old_map) { | ||||
if ((old_entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0) | if ((old_entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0) | ||||
panic("vm_map_fork: encountered a submap"); | panic("vm_map_fork: encountered a submap"); | ||||
inh = old_entry->inheritance; | inh = old_entry->inheritance; | ||||
if ((old_entry->eflags & MAP_ENTRY_GUARD) != 0 && | if ((old_entry->eflags & MAP_ENTRY_GUARD) != 0 && | ||||
inh != VM_INHERIT_NONE) | inh != VM_INHERIT_NONE) | ||||
▲ Show 20 Lines • Show All 1,072 Lines • Show Last 20 Lines |
() are excessive.
Also I suggest to move the line right after new_map assignment (line 4098), no need for blank lines around.