[src/trunk]: src/sys/fs/tmpfs Backout previous. May be I need more coffee.

[enami <enami%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6ae977fadb97
branches:  trunk
changeset: 766679:6ae977fadb97
user:      enami <enami%NetBSD.org@localhost>
date:      Thu Jun 30 00:37:07 2011 +0000

description:
Backout previous.  May be I need more coffee.

diffstat:

 sys/fs/tmpfs/tmpfs_subr.c |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 328633f5bd1c -r 6ae977fadb97 sys/fs/tmpfs/tmpfs_subr.c
--- a/sys/fs/tmpfs/tmpfs_subr.c Thu Jun 30 00:09:26 2011 +0000
+++ b/sys/fs/tmpfs/tmpfs_subr.c Thu Jun 30 00:37:07 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tmpfs_subr.c,v 1.75 2011/06/30 00:09:26 enami Exp $    */
+/*     $NetBSD: tmpfs_subr.c,v 1.76 2011/06/30 00:37:07 enami Exp $    */
 
 /*
  * Copyright (c) 2005-2011 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.75 2011/06/30 00:09:26 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.76 2011/06/30 00:37:07 enami Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
@@ -821,8 +821,7 @@
                        return ENOSPC;
                }
        } else if (newsize < oldsize) {
-               int zerolen = MIN(newpages << PAGE_SHIFT, node->tn_size)
-                   - newsize;
+               int zerolen = MIN(round_page(newsize), node->tn_size) - newsize;
 
                ubc_zerorange(uobj, newsize, zerolen, UBC_UNMAP_FLAG(vp));
        }
@@ -831,7 +830,16 @@
        node->tn_size = newsize;
        uvm_vnp_setsize(vp, newsize);
 
+       /*
+        * Free "backing store".
+        */
        if (newpages < oldpages) {
+               KASSERT(uobj->vmobjlock == vp->v_interlock);
+
+               mutex_enter(uobj->vmobjlock);
+               uao_dropswap_range(uobj, newpages, oldpages);
+               mutex_exit(uobj->vmobjlock);
+
                /* Decrease the used-memory counter. */
                tmpfs_mem_decr(tmp, (oldpages - newpages) << PAGE_SHIFT);
        }