diff options
| author | kib <kib@FreeBSD.org> | 2016-06-02 02:39:40 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-06-02 02:39:40 +0000 |
| commit | 6071389ee563b727481090dc5f7d57bdd9acfde6 (patch) | |
| tree | 4b6c43180da890283672f55a109832779fac46c8 | |
| parent | 649b4008dde9927d5fdeb2d50853c68d2bb7abb4 (diff) | |
| download | FreeBSD-src-6071389ee563b727481090dc5f7d57bdd9acfde6.zip FreeBSD-src-6071389ee563b727481090dc5f7d57bdd9acfde6.tar.gz | |
MFC r300758:
Prevent parallel object collapses.
| -rw-r--r-- | sys/vm/vm_object.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 95a9a77..6d193de 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1721,6 +1721,9 @@ vm_object_collapse(vm_object_t object) * case. */ if (backing_object->ref_count == 1) { + vm_object_pip_add(object, 1); + vm_object_pip_add(backing_object, 1); + /* * If there is exactly one reference to the backing * object, we can collapse it into the parent. @@ -1792,11 +1795,13 @@ vm_object_collapse(vm_object_t object) KASSERT(backing_object->ref_count == 1, ( "backing_object %p was somehow re-referenced during collapse!", backing_object)); + vm_object_pip_wakeup(backing_object); backing_object->type = OBJT_DEAD; backing_object->ref_count = 0; VM_OBJECT_WUNLOCK(backing_object); vm_object_destroy(backing_object); + vm_object_pip_wakeup(object); object_collapses++; } else { /* |
