Module Name: src
Committed By: rmind
Date: Sun Jun 12 03:06:00 UTC 2011
Modified Files:
src/sys/rump/librump/rumpvfs [rmind-uvmplock]: rumpfs.c vm_vfs.c
Log Message:
Sync RUMP's rump_etfs_remove() and uvm_aio_aiodone() with branch changes.
To generate a diff of this commit:
cvs rdiff -u -r1.37.2.6 -r1.37.2.7 src/sys/rump/librump/rumpvfs/rumpfs.c
cvs rdiff -u -r1.15.4.4 -r1.15.4.5 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/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.37.2.6 src/sys/rump/librump/rumpvfs/rumpfs.c:1.37.2.7
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.37.2.6 Thu May 19 03:43:04 2011
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Sun Jun 12 03:06:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.37.2.6 2011/05/19 03:43:04 rmind Exp $ */
+/* $NetBSD: rumpfs.c,v 1.37.2.7 2011/06/12 03:06:00 rmind Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.37.2.6 2011/05/19 03:43:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.37.2.7 2011/06/12 03:06:00 rmind Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -489,7 +489,7 @@
mutex_enter(&reclock);
if ((vp = et->et_rn->rn_vp) != NULL)
- mutex_enter(&vp->v_interlock);
+ mutex_enter(vp->v_interlock);
mutex_exit(&reclock);
if (vp && vget(vp, 0) == 0)
vgone(vp);
Index: src/sys/rump/librump/rumpvfs/vm_vfs.c
diff -u src/sys/rump/librump/rumpvfs/vm_vfs.c:1.15.4.4 src/sys/rump/librump/rumpvfs/vm_vfs.c:1.15.4.5
--- src/sys/rump/librump/rumpvfs/vm_vfs.c:1.15.4.4 Thu Apr 21 01:42:18 2011
+++ src/sys/rump/librump/rumpvfs/vm_vfs.c Sun Jun 12 03:06:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_vfs.c,v 1.15.4.4 2011/04/21 01:42:18 rmind Exp $ */
+/* $NetBSD: vm_vfs.c,v 1.15.4.5 2011/06/12 03:06:00 rmind 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.15.4.4 2011/04/21 01:42:18 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.15.4.5 2011/06/12 03:06:00 rmind Exp $");
#include <sys/param.h>
@@ -69,11 +69,11 @@
uobj = pgs[0]->uobject;
KASSERT(uobj);
- mutex_enter(&uobj->vmobjlock);
+ mutex_enter(uobj->vmobjlock);
mutex_enter(&uvm_pageqlock);
uvm_page_unbusy(pgs, npages);
mutex_exit(&uvm_pageqlock);
- mutex_exit(&uobj->vmobjlock);
+ mutex_exit(uobj->vmobjlock);
uvm_pageout_done(pageout);
