Module Name: src
Committed By: pooka
Date: Thu Aug 19 02:07:11 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: vm_vfs.c
Log Message:
Use the same base pagerflags for both ubc_uiomove and ubc_zerorange.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/librump/rumpvfs/vm_vfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/vm_vfs.c
diff -u src/sys/rump/librump/rumpvfs/vm_vfs.c:1.16 src/sys/rump/librump/rumpvfs/vm_vfs.c:1.17
--- src/sys/rump/librump/rumpvfs/vm_vfs.c:1.16 Wed Jun 2 12:07:03 2010
+++ src/sys/rump/librump/rumpvfs/vm_vfs.c Thu Aug 19 02:07:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_vfs.c,v 1.16 2010/06/02 12:07:03 pooka Exp $ */
+/* $NetBSD: vm_vfs.c,v 1.17 2010/08/19 02:07:11 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.16 2010/06/02 12:07:03 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.17 2010/08/19 02:07:11 pooka Exp $");
#include <sys/param.h>
@@ -89,6 +89,8 @@
* UBC
*/
+#define PAGERFLAGS (PGO_SYNCIO | PGO_NOBLOCKALLOC | PGO_NOTIMESTAMP)
+
void
uvm_vnp_zerorange(struct vnode *vp, off_t off, size_t len)
{
@@ -106,7 +108,7 @@
memset(pgs, 0, npages * sizeof(struct vm_page *));
mutex_enter(&uobj->vmobjlock);
rv = uobj->pgops->pgo_get(uobj, off, pgs, &npages, 0,
- VM_PROT_READ | VM_PROT_WRITE, 0, PGO_SYNCIO);
+ VM_PROT_READ | VM_PROT_WRITE, 0, PAGERFLAGS | PGO_PASTEOF);
KASSERT(npages > 0);
for (i = 0; i < npages; i++) {
@@ -147,7 +149,7 @@
pgalloc = npages * sizeof(pgs);
pgs = kmem_zalloc(pgalloc, KM_SLEEP);
- pagerflags = PGO_SYNCIO | PGO_NOBLOCKALLOC | PGO_NOTIMESTAMP;
+ pagerflags = PAGERFLAGS;
if (flags & UBC_WRITE)
pagerflags |= PGO_PASTEOF;
if (flags & UBC_FAULTBUSY)
