Module Name: src
Committed By: martin
Date: Sun Aug 12 13:02:59 UTC 2012
Modified Files:
src/lib/libp2k [netbsd-6]: p2k.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #483):
lib/libp2k/p2k.c: revision 1.56
libpuffs and libp2k both use the cookie to different structure, which now
leads to struct p2k_node corruption now that libpuffs used pn_nlookup field
in struct puffs_node to avoid race conditions.
Attempt to fix that by adding a struct puffs_node at the beginning of struct
p2k_node. This seems to fix kern/46734
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.4.1 src/lib/libp2k/p2k.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.55 src/lib/libp2k/p2k.c:1.55.4.1
--- src/lib/libp2k/p2k.c:1.55 Mon Jul 4 08:07:29 2011
+++ src/lib/libp2k/p2k.c Sun Aug 12 13:02:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: p2k.c,v 1.55 2011/07/04 08:07:29 manu Exp $ */
+/* $NetBSD: p2k.c,v 1.55.4.1 2012/08/12 13:02:59 martin Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -83,6 +83,7 @@ struct p2k_mount {
};
struct p2k_node {
+ struct puffs_node p2n_pn;
struct vnode *p2n_vp;
LIST_ENTRY(p2k_node) p2n_entries;
