Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/fs/puffs Pull up following revision(s) (requested by ...
details: https://anonhg.NetBSD.org/src/rev/650c606b7399
branches: netbsd-7
changeset: 798383:650c606b7399
user: martin <martin%NetBSD.org@localhost>
date: Tue Sep 30 18:14:22 2014 +0000
description:
Pull up following revision(s) (requested by hannken in ticket #67):
sys/fs/puffs/puffs_node.c: revision 1.34
sys/fs/puffs/puffs_vnops.c: revision 1.187
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 09d862768e8c -r 650c606b7399 sys/fs/puffs/puffs_node.c
--- a/sys/fs/puffs/puffs_node.c Mon Sep 29 16:21:56 2014 +0000
+++ b/sys/fs/puffs/puffs_node.c Tue Sep 30 18:14:22 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_node.c,v 1.31.4.2 2014/09/10 08:42:28 martin Exp $ */
+/* $NetBSD: puffs_node.c,v 1.31.4.3 2014/09/30 18:14:22 martin 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.31.4.2 2014/09/10 08:42:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.31.4.3 2014/09/30 18:14:22 martin 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 09d862768e8c -r 650c606b7399 sys/fs/puffs/puffs_vnops.c
--- a/sys/fs/puffs/puffs_vnops.c Mon Sep 29 16:21:56 2014 +0000
+++ b/sys/fs/puffs/puffs_vnops.c Tue Sep 30 18:14:22 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.182.2.4 2014/09/11 14:00:54 martin Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.182.2.5 2014/09/30 18:14:22 martin 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.182.2.4 2014/09/11 14:00:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.182.2.5 2014/09/30 18:14:22 martin 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);
Home |
Main Index |
Thread Index |
Old Index