diff options
| author | alc <alc@FreeBSD.org> | 2004-07-25 07:48:47 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2004-07-25 07:48:47 +0000 |
| commit | 035cd2c09de3f16641eec32f0b476bd084170f6c (patch) | |
| tree | 710c2607011b1c4dc7b813fe99cae13a196a9996 /sys/vm/vm_object.c | |
| parent | a16c034682b3e5ab7ed6f94313eb01a325be18ff (diff) | |
| download | FreeBSD-src-035cd2c09de3f16641eec32f0b476bd084170f6c.zip FreeBSD-src-035cd2c09de3f16641eec32f0b476bd084170f6c.tar.gz | |
Make the code and comments for vm_object_coalesce() consistent.
Diffstat (limited to 'sys/vm/vm_object.c')
| -rw-r--r-- | sys/vm/vm_object.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 01540f9..8735156 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1824,17 +1824,14 @@ again: * Parameters: * prev_object First object to coalesce * prev_offset Offset into prev_object - * next_object Second object into coalesce - * next_offset Offset into next_object - * * prev_size Size of reference to prev_object - * next_size Size of reference to next_object + * next_size Size of reference to the second object * * Conditions: * The object must *not* be locked. */ boolean_t -vm_object_coalesce(vm_object_t prev_object, vm_pindex_t prev_pindex, +vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, vm_size_t prev_size, vm_size_t next_size) { vm_pindex_t next_pindex; @@ -1865,7 +1862,7 @@ vm_object_coalesce(vm_object_t prev_object, vm_pindex_t prev_pindex, prev_size >>= PAGE_SHIFT; next_size >>= PAGE_SHIFT; - next_pindex = prev_pindex + prev_size; + next_pindex = OFF_TO_IDX(prev_offset) + prev_size; if ((prev_object->ref_count > 1) && (prev_object->size != next_pindex)) { |
