summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2014-08-04 01:14:27 +0000
committerkib <kib@FreeBSD.org>2014-08-04 01:14:27 +0000
commitdb3e0174c3cdafd7135130ee7298cb312e9114f9 (patch)
tree2824edf5898b9a855014be2446d1b0f7bae1c23b
parent00b893a5990df43ad05de3e6c2b27136695f27c3 (diff)
downloadFreeBSD-src-db3e0174c3cdafd7135130ee7298cb312e9114f9.zip
FreeBSD-src-db3e0174c3cdafd7135130ee7298cb312e9114f9.tar.gz
MFC r269190:
For md(4), posix shm(3) and tmpfs(5), free swap space used by paged in dirty page, which is written by the process.
-rw-r--r--sys/dev/md/md.c4
-rw-r--r--sys/kern/uipc_shm.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 8ae51d1..b1d579f 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -895,8 +895,10 @@ mdstart_swap(struct md_s *sc, struct bio *bp)
else
vm_page_activate(m);
vm_page_unlock(m);
- if (bp->bio_cmd == BIO_WRITE)
+ if (bp->bio_cmd == BIO_WRITE) {
vm_page_dirty(m);
+ vm_pager_page_unswapped(m);
+ }
/* Actions on further pages start at offset 0 */
p += PAGE_SIZE - offs;
diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c
index cf00ff4..024640b 100644
--- a/sys/kern/uipc_shm.c
+++ b/sys/kern/uipc_shm.c
@@ -199,6 +199,7 @@ uiomove_object_page(vm_object_t obj, size_t len, struct uio *uio)
if (uio->uio_rw == UIO_WRITE && error == 0) {
VM_OBJECT_WLOCK(obj);
vm_page_dirty(m);
+ vm_pager_page_unswapped(m);
VM_OBJECT_WUNLOCK(obj);
}
vm_page_lock(m);
OpenPOWER on IntegriCloud