[src/trunk]: src/sys/fs/tmpfs - Use << PAGE_SHIFT rather than calling round_p...

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

details:   https://anonhg.NetBSD.org/src/rev/328633f5bd1c
branches:  trunk
changeset: 766678:328633f5bd1c
user:      enami <enami%NetBSD.org@localhost>
date:      Thu Jun 30 00:09:26 2011 +0000

description:
- Use << PAGE_SHIFT rather than calling round_page again.
- No need to call uao_dropswap_range() here since uao_dropswap()
  is already called for each pages by uvm_vnp_setsize().

diffstat:

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

diffs (45 lines):

diff -r eac7fe7ebd38 -r 328633f5bd1c sys/fs/tmpfs/tmpfs_subr.c
--- a/sys/fs/tmpfs/tmpfs_subr.c Wed Jun 29 23:15:55 2011 +0000
+++ b/sys/fs/tmpfs/tmpfs_subr.c Thu Jun 30 00:09:26 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tmpfs_subr.c,v 1.74 2011/06/16 09:21:02 hannken Exp $  */
+/*     $NetBSD: tmpfs_subr.c,v 1.75 2011/06/30 00:09:26 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.74 2011/06/16 09:21:02 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.75 2011/06/30 00:09:26 enami Exp $");
 
 #include <sys/param.h>
 #include <sys/dirent.h>
@@ -821,7 +821,8 @@
                        return ENOSPC;
                }
        } else if (newsize < oldsize) {
-               int zerolen = MIN(round_page(newsize), node->tn_size) - newsize;
+               int zerolen = MIN(newpages << PAGE_SHIFT, node->tn_size)
+                   - newsize;
 
                ubc_zerorange(uobj, newsize, zerolen, UBC_UNMAP_FLAG(vp));
        }
@@ -830,16 +831,7 @@
        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);
        }