From 00f4c73e1b80bdeb4e4defd5ca686407f24092b2 Mon Sep 17 00:00:00 2001 From: kib Date: Wed, 30 Nov 2011 17:39:00 +0000 Subject: [PATCH 155/175] Rename vm_page_set_valid() to vm_page_set_valid_range(). The vm_page_set_valid() is the most reasonable name for the m->valid accessor. Reviewed by: attilio, alc git-svn-id: http://svn.freebsd.org/base/head@228156 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f (cherry picked from commit 93300e7495b3f47818dac481d6526c08ed0c7aad) Signed-off-by: Xin Li --- sys/fs/nfsclient/nfs_clbio.c | 2 +- sys/fs/nwfs/nwfs_io.c | 2 +- sys/fs/smbfs/smbfs_io.c | 2 +- sys/kern/uipc_shm.c | 2 +- sys/kern/vfs_bio.c | 4 ++-- sys/nfsclient/nfs_bio.c | 2 +- sys/vm/vm_page.c | 6 +++--- sys/vm/vm_page.h | 2 +- sys/vm/vnode_pager.c | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c index b33c8a5..d64257c 100644 --- a/sys/fs/nfsclient/nfs_clbio.c +++ b/sys/fs/nfsclient/nfs_clbio.c @@ -211,7 +211,7 @@ ncl_getpages(struct vop_getpages_args *ap) * Read operation filled a partial page. */ m->valid = 0; - vm_page_set_valid(m, 0, size - toff); + vm_page_set_valid_range(m, 0, size - toff); KASSERT(m->dirty == 0, ("nfs_getpages: page %p is dirty", m)); } else { diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c index d764f79..a7844b3 100644 --- a/sys/fs/nwfs/nwfs_io.c +++ b/sys/fs/nwfs/nwfs_io.c @@ -452,7 +452,7 @@ nwfs_getpages(ap) ("nwfs_getpages: page %p is dirty", m)); } else { int nvalid = ((size + DEV_BSIZE - 1) - toff) & ~(DEV_BSIZE - 1); - vm_page_set_valid(m, 0, nvalid); + vm_page_set_valid_range(m, 0, nvalid); KASSERT((m->dirty & vm_page_bits(0, nvalid)) == 0, ("nwfs_getpages: page %p is dirty", m)); } diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index 4599a6f..d4a4262 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -509,7 +509,7 @@ smbfs_getpages(ap) * Read operation filled a partial page. */ m->valid = 0; - vm_page_set_valid(m, 0, size - toff); + vm_page_set_valid_range(m, 0, size - toff); KASSERT(m->dirty == 0, ("smbfs_getpages: page %p is dirty", m)); } else { diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 8469f67..3a639fb 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -301,7 +301,7 @@ shm_dotruncate(struct shmfd *shmfd, off_t length) * have been zeroed. Some of these valid bits may * have already been set. */ - vm_page_set_valid(m, base, size); + vm_page_set_valid_range(m, base, size); /* * Round "base" to the next block boundary so that the diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 7b5b015..e820788 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -3499,7 +3499,7 @@ vfs_page_set_valid(struct buf *bp, vm_ooffset_t off, vm_page_t m) * entire page. */ if (eoff > off) - vm_page_set_valid(m, off & PAGE_MASK, eoff - off); + vm_page_set_valid_range(m, off & PAGE_MASK, eoff - off); } /* @@ -3662,7 +3662,7 @@ vfs_bio_set_valid(struct buf *bp, int base, int size) m = bp->b_pages[i]; if (n > size) n = size; - vm_page_set_valid(m, base & PAGE_MASK, n); + vm_page_set_valid_range(m, base & PAGE_MASK, n); base += n; size -= n; n = PAGE_SIZE; diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index 305c189..97e878a 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -206,7 +206,7 @@ nfs_getpages(struct vop_getpages_args *ap) * Read operation filled a partial page. */ m->valid = 0; - vm_page_set_valid(m, 0, size - toff); + vm_page_set_valid_range(m, 0, size - toff); KASSERT(m->dirty == 0, ("nfs_getpages: page %p is dirty", m)); } else { diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 53aff03..56e5cc0 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2339,7 +2339,7 @@ vm_page_bits(int base, int size) } /* - * vm_page_set_valid: + * vm_page_set_valid_range: * * Sets portions of a page valid. The arguments are expected * to be DEV_BSIZE aligned but if they aren't the bitmap is inclusive @@ -2349,7 +2349,7 @@ vm_page_bits(int base, int size) * (base + size) must be less then or equal to PAGE_SIZE. */ void -vm_page_set_valid(vm_page_t m, int base, int size) +vm_page_set_valid_range(vm_page_t m, int base, int size) { int endoff, frag; @@ -2382,7 +2382,7 @@ vm_page_set_valid(vm_page_t m, int base, int size) * is already dirty. */ KASSERT((~m->valid & vm_page_bits(base, size) & m->dirty) == 0, - ("vm_page_set_valid: page %p is dirty", m)); + ("vm_page_set_valid_range: page %p is dirty", m)); /* * Set valid bits inclusive of any overlap. diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index dbb0fdb..e182bec 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -396,7 +396,7 @@ void vm_page_reference(vm_page_t m); void vm_page_remove (vm_page_t); void vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t); void vm_page_requeue(vm_page_t m); -void vm_page_set_valid(vm_page_t m, int base, int size); +void vm_page_set_valid_range(vm_page_t m, int base, int size); void vm_page_sleep(vm_page_t m, const char *msg); vm_page_t vm_page_splay(vm_pindex_t, vm_page_t); vm_offset_t vm_page_startup(vm_offset_t vaddr); diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index cc72260..fd24969 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -420,7 +420,7 @@ vnode_pager_setsize(vp, nsize) * have been zeroed. Some of these valid bits may * have already been set. */ - vm_page_set_valid(m, base, size); + vm_page_set_valid_range(m, base, size); /* * Round "base" to the next block boundary so that the @@ -971,7 +971,7 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage) * we just try to clear the piece that we couldn't * read. */ - vm_page_set_valid(mt, 0, + vm_page_set_valid_range(mt, 0, object->un_pager.vnp.vnp_size - tfoff); KASSERT((mt->dirty & vm_page_bits(0, object->un_pager.vnp.vnp_size - tfoff)) == 0, -- 1.7.9.4