Implement and use a single optimized function for unholding a set of pages.

Reviewed by:	kib@

2 files changed, 4 insertions, 18 deletions

diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 22401a7..444b424 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -749,7 +749,7 @@ pipe_build_write_buffer(wpipe, uio)
 {
 	pmap_t pmap;
 	u_int size;
-	int i, j;
+	int i;
 	vm_offset_t addr, endaddr;
 
 	PIPE_LOCK_ASSERT(wpipe, MA_NOTOWNED);
@@ -771,11 +771,7 @@ pipe_build_write_buffer(wpipe, uio)
 		 */
 	race:
 		if (vm_fault_quick((caddr_t)addr, VM_PROT_READ) < 0) {
-			for (j = 0; j < i; j++) {
-				vm_page_lock(wpipe->pipe_map.ms[j]);
-				vm_page_unhold(wpipe->pipe_map.ms[j]);
-				vm_page_unlock(wpipe->pipe_map.ms[j]);
-			}
+			vm_page_unhold_pages(wpipe->pipe_map.ms, i);
 			return (EFAULT);
 		}
 		wpipe->pipe_map.ms[i] = pmap_extract_and_hold(pmap, addr,
@@ -812,14 +808,9 @@ static void
 pipe_destroy_write_buffer(wpipe)
 	struct pipe *wpipe;
 {
-	int i;
 
 	PIPE_LOCK_ASSERT(wpipe, MA_OWNED);
-	for (i = 0; i < wpipe->pipe_map.npages; i++) {
-		vm_page_lock(wpipe->pipe_map.ms[i]);
-		vm_page_unhold(wpipe->pipe_map.ms[i]);
-		vm_page_unlock(wpipe->pipe_map.ms[i]);
-	}
+	vm_page_unhold_pages(wpipe->pipe_map.ms, wpipe->pipe_map.npages);
 	wpipe->pipe_map.npages = 0;
 }
 
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index ccde4b4..7d04e33 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -3911,16 +3911,11 @@ retry:
 void
 vunmapbuf(struct buf *bp)
 {
-	int pidx;
 	int npages;
 
 	npages = bp->b_npages;
 	pmap_qremove(trunc_page((vm_offset_t)bp->b_data), npages);
-	for (pidx = 0; pidx < npages; pidx++) {
-		vm_page_lock(bp->b_pages[pidx]);
-		vm_page_unhold(bp->b_pages[pidx]);
-		vm_page_unlock(bp->b_pages[pidx]);
-	}
+	vm_page_unhold_pages(bp->b_pages, npages);
 	
 	bp->b_data = bp->b_saveaddr;
 }