diff options
| author | dyson <dyson@FreeBSD.org> | 1997-01-01 04:45:05 +0000 |
|---|---|---|
| committer | dyson <dyson@FreeBSD.org> | 1997-01-01 04:45:05 +0000 |
| commit | 3bb329572750ee99856d41fccb4e6e31378796bb (patch) | |
| tree | 07d44e1fbe1ed6cd398ee49f2ac064875dfd2eb5 /sys/vm/vm_object.c | |
| parent | 6f6bb8520fe6d1320bddacbdf08046e8634d0f3d (diff) | |
| download | FreeBSD-src-3bb329572750ee99856d41fccb4e6e31378796bb.zip FreeBSD-src-3bb329572750ee99856d41fccb4e6e31378796bb.tar.gz | |
Guess what? We left alot of the old collapse code that is not needed
anymore with the "full" collapse fix that we added about 1yr ago!!! The
code has been removed by optioning it out for now, so we can put it back
in ASAP if any problems are found.
Diffstat (limited to 'sys/vm/vm_object.c')
| -rw-r--r-- | sys/vm/vm_object.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index bb51ee2..baa3761 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -793,6 +793,7 @@ vm_object_shadow(object, offset, length) } +#if defined(OLD_COLLAPSE_CODE) /* * this version of collapse allows the operation to occur earlier and * when paging_in_progress is true for an object... This is not a complete @@ -860,6 +861,7 @@ vm_object_qcollapse(object) } backing_object->ref_count -= 2; } +#endif /* * vm_object_collapse: @@ -912,7 +914,9 @@ vm_object_collapse(object) if (object->paging_in_progress != 0 || backing_object->paging_in_progress != 0) { +#if defined(OLD_COLLAPSE_CODE) vm_object_qcollapse(object); +#endif return; } @@ -1288,10 +1292,12 @@ vm_object_coalesce(prev_object, prev_pindex, prev_size, next_size) return (FALSE); } +#if defined(OLD_COLLAPSE_CODE) /* * Try to collapse the object first */ vm_object_collapse(prev_object); +#endif /* * Can't coalesce if: . more than one reference . paged out . shadows |
