diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2008-04-10 16:43:48 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2008-04-10 16:43:48 +0000 |
| commit | b06ab379093d43635a90201aa771b46937dfe786 (patch) | |
| tree | 97ef609869c2138e085e29c2b0a307a97007f86e | |
| parent | 4829ef2cd36463eb34bb2ada75bd852f8df8b1e1 (diff) | |
Correctly amount swap usage for anons, from NetBSD via PR 5772.
| -rw-r--r-- | sys/uvm/uvm_anon.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/uvm/uvm_anon.c b/sys/uvm/uvm_anon.c index 673eddc4c2d..a718f69276a 100644 --- a/sys/uvm/uvm_anon.c +++ b/sys/uvm/uvm_anon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_anon.c,v 1.28 2007/06/18 21:51:15 pedro Exp $ */ +/* $OpenBSD: uvm_anon.c,v 1.29 2008/04/10 16:43:47 miod Exp $ */ /* $NetBSD: uvm_anon.c,v 1.10 2000/11/25 06:27:59 chs Exp $ */ /* @@ -156,6 +156,13 @@ uvm_anfree(anon) anon, pg, 0, 0); } } + if (pg == NULL && anon->an_swslot != 0) { + /* this page is no longer only in swap. */ + simple_lock(&uvm.swap_data_lock); + KASSERT(uvmexp.swpgonly > 0); + uvmexp.swpgonly--; + simple_unlock(&uvm.swap_data_lock); + } /* * free any swap resources. @@ -191,13 +198,6 @@ uvm_anon_dropswap(anon) anon, anon->an_swslot, 0, 0); uvm_swap_free(anon->an_swslot, 1); anon->an_swslot = 0; - - if (anon->an_page == NULL) { - /* this page is no longer only in swap. */ - simple_lock(&uvm.swap_data_lock); - uvmexp.swpgonly--; - simple_unlock(&uvm.swap_data_lock); - } } /* |