From bbff8513e76fcb010177db55558331baa2ae1b48 Mon Sep 17 00:00:00 2001 From: enami Date: Thu, 30 Jun 2011 00:09:26 +0000 Subject: - 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(). --- sys/fs/tmpfs/tmpfs_subr.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'sys') diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index d4632f80fa1..933d2fab4c9 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -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 -__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 #include @@ -821,7 +821,8 @@ tmpfs_reg_resize(struct vnode *vp, off_t newsize) 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 @@ tmpfs_reg_resize(struct vnode *vp, off_t newsize) 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); } -- cgit