diff options
| author | kib <kib@FreeBSD.org> | 2013-11-12 08:01:58 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-11-12 08:01:58 +0000 |
| commit | faa83dc918d5eb1e5f07b3e016ae91b0ec170be4 (patch) | |
| tree | dddd187e05d6c665f2858e5c9db85ee1d95a6c8d /sys/vm/vm_object.c | |
| parent | 030879a51a41bce0fe9494f6abe935dd02f70c58 (diff) | |
| download | FreeBSD-src-faa83dc918d5eb1e5f07b3e016ae91b0ec170be4.zip FreeBSD-src-faa83dc918d5eb1e5f07b3e016ae91b0ec170be4.tar.gz | |
MFC r257680:
Do not coalesce if the swap object belongs to tmpfs vnode.
Approved by: re (glebius)
Diffstat (limited to 'sys/vm/vm_object.c')
| -rw-r--r-- | sys/vm/vm_object.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 9dea3a1..8683e2f 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2099,8 +2099,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset, if (prev_object == NULL) return (TRUE); VM_OBJECT_WLOCK(prev_object); - if (prev_object->type != OBJT_DEFAULT && - prev_object->type != OBJT_SWAP) { + if ((prev_object->type != OBJT_DEFAULT && + prev_object->type != OBJT_SWAP) || + (prev_object->flags & OBJ_TMPFS) != 0) { VM_OBJECT_WUNLOCK(prev_object); return (FALSE); } |
