diff options
| author | jhb <jhb@FreeBSD.org> | 2001-05-23 22:13:10 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-05-23 22:13:10 +0000 |
| commit | 04aacfa65885d1d56b9137ffbcd462f2e51ff5b6 (patch) | |
| tree | 3c8b42849386cfd707f88ecdb1afe17da13f3386 /sys/vm/vm_unix.c | |
| parent | aae0e8da5fb568e7b9883549abdc92dea9e13ba3 (diff) | |
| download | FreeBSD-src-04aacfa65885d1d56b9137ffbcd462f2e51ff5b6.zip FreeBSD-src-04aacfa65885d1d56b9137ffbcd462f2e51ff5b6.tar.gz | |
Acquire Giant around vm_map_remove() inside of the obreak() syscall for
vm_object_terminate().
Diffstat (limited to 'sys/vm/vm_unix.c')
| -rw-r--r-- | sys/vm/vm_unix.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c index 29ae2ad..f4efc2e 100644 --- a/sys/vm/vm_unix.c +++ b/sys/vm/vm_unix.c @@ -95,11 +95,11 @@ obreak(p, uap) return EINVAL; } - mtx_lock(&vm_mtx); if (new > old) { vm_size_t diff; diff = new - old; + mtx_lock(&vm_mtx); rv = vm_map_find(&vm->vm_map, NULL, 0, &old, diff, FALSE, VM_PROT_ALL, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { @@ -107,15 +107,20 @@ obreak(p, uap) return (ENOMEM); } vm->vm_dsize += btoc(diff); + mtx_unlock(&vm_mtx); } else if (new < old) { + mtx_lock(&Giant); + mtx_lock(&vm_mtx); rv = vm_map_remove(&vm->vm_map, new, old); if (rv != KERN_SUCCESS) { mtx_unlock(&vm_mtx); + mtx_unlock(&Giant); return (ENOMEM); } vm->vm_dsize -= btoc(old - new); + mtx_unlock(&vm_mtx); + mtx_unlock(&Giant); } - mtx_unlock(&vm_mtx); return (0); } |
