[src/trunk]: src/sys/fs/puffs Fix the puffs_sop_thread -> puffs_cookie2vnode ...

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

details:   https://anonhg.NetBSD.org/src/rev/420d72858b61
branches:  trunk
changeset: 802734:420d72858b61
user:      hannken <hannken%NetBSD.org@localhost>
date:      Tue Sep 30 10:15:03 2014 +0000

description:
Fix the puffs_sop_thread -> puffs_cookie2vnode path:
- pass the cookie by reference
- add missing mutex_exit()
- update assertion for VNON typed vnodes

diffstat:

 sys/fs/puffs/puffs_node.c  |  7 ++++---
 sys/fs/puffs/puffs_vnops.c |  6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r 41a3c235e33e -r 420d72858b61 sys/fs/puffs/puffs_node.c
--- a/sys/fs/puffs/puffs_node.c Tue Sep 30 08:20:29 2014 +0000
+++ b/sys/fs/puffs/puffs_node.c Tue Sep 30 10:15:03 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puffs_node.c,v 1.33 2014/09/05 15:39:18 manu Exp $     */
+/*     $NetBSD: puffs_node.c,v 1.34 2014/09/30 10:15:03 hannken Exp $  */
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.33 2014/09/05 15:39:18 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.34 2014/09/30 10:15:03 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/hash.h>
@@ -260,7 +260,7 @@
                return 0;
        }
 
-       rv = vcache_get(PMPTOMP(pmp), ck, sizeof(ck), vpp);
+       rv = vcache_get(PMPTOMP(pmp), &ck, sizeof(ck), vpp);
        if (rv != 0)
                return rv;
        mutex_enter((*vpp)->v_interlock);
@@ -270,6 +270,7 @@
                *vpp = NULL;
                return PUFFS_NOSUCHCOOKIE;
        }
+       mutex_exit((*vpp)->v_interlock);
 
        return 0;
 }
diff -r 41a3c235e33e -r 420d72858b61 sys/fs/puffs/puffs_vnops.c
--- a/sys/fs/puffs/puffs_vnops.c        Tue Sep 30 08:20:29 2014 +0000
+++ b/sys/fs/puffs/puffs_vnops.c        Tue Sep 30 10:15:03 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: puffs_vnops.c,v 1.186 2014/09/11 07:59:14 manu Exp $   */
+/*     $NetBSD: puffs_vnops.c,v 1.187 2014/09/30 10:15:03 hannken Exp $        */
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.186 2014/09/11 07:59:14 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.187 2014/09/30 10:15:03 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -1428,7 +1428,7 @@
                if (__predict_true(VPTOPP(vp)->pn_parent != NULL))
                        vrele(VPTOPP(vp)->pn_parent);
                else
-                       KASSERT(vp->v_vflag & VV_ROOT);
+                       KASSERT(vp->v_type == VNON || (vp->v_vflag & VV_ROOT));
        }
 
        puffs_putvnode(vp);