[src/rmind-uvmplock]: src/sys/rump/librump/rumpvfs Sync RUMP's rump_etfs_remo...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6c0d246b0df3
branches:  rmind-uvmplock
changeset: 753098:6c0d246b0df3
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sun Jun 12 03:06:00 2011 +0000

description:
Sync RUMP's rump_etfs_remove() and uvm_aio_aiodone() with branch changes.

diffstat:

 sys/rump/librump/rumpvfs/rumpfs.c |  6 +++---
 sys/rump/librump/rumpvfs/vm_vfs.c |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r 4f8c8180865f -r 6c0d246b0df3 sys/rump/librump/rumpvfs/rumpfs.c
--- a/sys/rump/librump/rumpvfs/rumpfs.c Sun Jun 12 02:39:37 2011 +0000
+++ b/sys/rump/librump/rumpvfs/rumpfs.c Sun Jun 12 03:06:00 2011 +0000
@@ -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);
diff -r 4f8c8180865f -r 6c0d246b0df3 sys/rump/librump/rumpvfs/vm_vfs.c
--- a/sys/rump/librump/rumpvfs/vm_vfs.c Sun Jun 12 02:39:37 2011 +0000
+++ b/sys/rump/librump/rumpvfs/vm_vfs.c Sun Jun 12 03:06:00 2011 +0000
@@ -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);