diff options
| author | phk <phk@FreeBSD.org> | 1996-05-03 21:01:54 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1996-05-03 21:01:54 +0000 |
| commit | 5d01dc3d502f27448cc5a6c62c8f103d25ac3df0 (patch) | |
| tree | 6e409b4bdf1f55b895a65877ef5486cfc5442060 /sys/vm/vnode_pager.c | |
| parent | 6ed0fd2b8bab9bd3b84ab82f273df31ce328c87d (diff) | |
| download | FreeBSD-src-5d01dc3d502f27448cc5a6c62c8f103d25ac3df0.zip FreeBSD-src-5d01dc3d502f27448cc5a6c62c8f103d25ac3df0.tar.gz | |
Another sweep over the pmap/vm macros, this time with more focus on
the usage. I'm not satisfied with the naming, but now at least there is
less bogus stuff around.
Diffstat (limited to 'sys/vm/vnode_pager.c')
| -rw-r--r-- | sys/vm/vnode_pager.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 773c5f6..4cef671 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91 - * $Id: vnode_pager.c,v 1.58 1996/01/19 04:00:31 dyson Exp $ + * $Id: vnode_pager.c,v 1.59 1996/03/19 05:13:22 dyson Exp $ */ /* @@ -295,10 +295,10 @@ vnode_pager_setsize(vp, nsize) */ if (nsize < object->un_pager.vnp.vnp_size) { vm_ooffset_t nsizerounded; - nsizerounded = IDX_TO_OFF(OFF_TO_IDX(nsize + PAGE_SIZE - 1)); + nsizerounded = IDX_TO_OFF(OFF_TO_IDX(nsize + PAGE_MASK)); if (nsizerounded < object->un_pager.vnp.vnp_size) { vm_object_page_remove(object, - OFF_TO_IDX(nsize + PAGE_SIZE - 1), + OFF_TO_IDX(nsize + PAGE_MASK), OFF_TO_IDX(object->un_pager.vnp.vnp_size), FALSE); } @@ -320,7 +320,7 @@ vnode_pager_setsize(vp, nsize) } } object->un_pager.vnp.vnp_size = nsize; - object->size = OFF_TO_IDX(nsize + PAGE_SIZE - 1); + object->size = OFF_TO_IDX(nsize + PAGE_MASK); } void @@ -518,9 +518,9 @@ vnode_pager_input_smlfs(object, m) if (error) break; - vm_page_set_validclean(m, (i * bsize) & (PAGE_SIZE-1), bsize); + vm_page_set_validclean(m, (i * bsize) & PAGE_MASK, bsize); } else { - vm_page_set_validclean(m, (i * bsize) & (PAGE_SIZE-1), bsize); + vm_page_set_validclean(m, (i * bsize) & PAGE_MASK, bsize); bzero((caddr_t) kva + i * bsize, bsize); } } @@ -897,7 +897,7 @@ vnode_pager_leaf_putpages(object, m, count, sync, rtvals) maxsize = object->un_pager.vnp.vnp_size - poffset; else maxsize = 0; - ncount = (maxsize + PAGE_SIZE - 1) / PAGE_SIZE; + ncount = btoc(maxsize); if (ncount < count) { for (i = ncount; i < count; i++) { rtvals[i] = VM_PAGER_BAD; |
