[src/trunk]: src/sys/coda fix locking in getpages when running executables.

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

details:   https://anonhg.NetBSD.org/src/rev/234bc5f8db2d
branches:  trunk
changeset: 779111:234bc5f8db2d
user:      christos <christos%NetBSD.org@localhost>
date:      Fri May 04 01:40:13 2012 +0000

description:
fix locking in getpages when running executables.

diffstat:

 sys/coda/coda_vnops.c |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 08fc8eb2d8b9 -r 234bc5f8db2d sys/coda/coda_vnops.c
--- a/sys/coda/coda_vnops.c     Fri May 04 01:38:56 2012 +0000
+++ b/sys/coda/coda_vnops.c     Fri May 04 01:40:13 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: coda_vnops.c,v 1.86 2012/05/03 14:26:42 christos Exp $ */
+/*     $NetBSD: coda_vnops.c,v 1.87 2012/05/04 01:40:13 christos Exp $ */
 
 /*
  *
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.86 2012/05/03 14:26:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.87 2012/05/04 01:40:13 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1898,10 +1898,10 @@
  * table when coda_inactive calls coda_unsave.
  */
 struct cnode *
-make_coda_node(CodaFid *fid, struct mount *vfsp, short type)
+make_coda_node(CodaFid *fid, struct mount *fvsp, short type)
 {
     struct cnode *cp;
-    int          err;
+    int          error;
 
     if ((cp = coda_find(fid)) == NULL) {
        vnode_t *vp;
@@ -1909,9 +1909,9 @@
        cp = coda_alloc();
        cp->c_fid = *fid;
 
-       err = getnewvnode(VT_CODA, vfsp, coda_vnodeop_p, NULL, &vp);
-       if (err) {
-           panic("%s: getnewvnode returned error %d", __func__, err);
+       error = getnewvnode(VT_CODA, fvsp, coda_vnodeop_p, NULL, &vp);
+       if (error) {
+           panic("%s: getnewvnode returned error %d", __func__, error);
        }
        vp->v_data = cp;
        vp->v_type = type;
@@ -1989,6 +1989,7 @@
                 * leave it in the same state on exit.
                 */
                if (waslocked == 0) {
+                       mutex_exit(vp->v_interlock);
                        cerror = vn_lock(vp, LK_EXCLUSIVE);
                        if (cerror) {
                                printf("%s: can't lock vnode %p\n",
@@ -2021,6 +2022,8 @@
 #endif
                cvp = cp->c_ovp;
                didopen = 1;
+               if (waslocked == 0)
+                       mutex_enter(vp->v_interlock);
        }
        KASSERT(cvp != NULL);