CVS commit: [yamt-pagecache] src/sys/rump/librump/rumpvfs

[YAMAMOTO Takashi]

Module Name:    src
Committed By:   yamt
Date:           Fri Nov  2 08:19:23 UTC 2012

Modified Files:
        src/sys/rump/librump/rumpvfs [yamt-pagecache]: vm_vfs.c

Log Message:
fix a merge botch


To generate a diff of this commit:
cvs rdiff -u -r1.32.2.2 -r1.32.2.3 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.32.2.2 src/sys/rump/librump/rumpvfs/vm_vfs.c:1.32.2.3
--- src/sys/rump/librump/rumpvfs/vm_vfs.c:1.32.2.2	Tue Oct 30 17:22:55 2012
+++ src/sys/rump/librump/rumpvfs/vm_vfs.c	Fri Nov  2 08:19:23 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_vfs.c,v 1.32.2.2 2012/10/30 17:22:55 yamt Exp $	*/
+/*	$NetBSD: vm_vfs.c,v 1.32.2.3 2012/11/02 08:19:23 yamt Exp $	*/
 
 /*
  * Copyright (c) 2008-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.32.2.2 2012/10/30 17:22:55 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.32.2.3 2012/11/02 08:19:23 yamt Exp $");
 
 #include <sys/param.h>
 
@@ -143,9 +143,7 @@ ubc_zerorange(struct uvm_object *uobj, o
 			start = (uint8_t *)pg->uanon + chunkoff;
 
 			memset(start, 0, chunklen);
-			mutex_enter(pguobj->vmobjlock);
 			uvm_pagemarkdirty(pg, UVM_PAGE_STATUS_DIRTY);
-			mutex_exit(pguobj->vmobjlock);
 
 			off += chunklen;
 			len -= chunklen;
@@ -215,10 +213,8 @@ ubc_uiomove(struct uvm_object *uobj, str
 				goto out;
 			}
 			if (uio->uio_rw == UIO_WRITE) {
-				mutex_enter(pguobj->vmobjlock);
 				pg->flags &= ~PG_FAKE;
 				uvm_pagemarkdirty(pg, UVM_PAGE_STATUS_DIRTY);
-				mutex_exit(pguobj->vmobjlock);
 			}
 			todo -= xfersize;
 		}