Module Name: src
Committed By: hannken
Date: Tue Jun 30 06:19:22 UTC 2015
Modified Files:
src/sys/miscfs/deadfs: dead_vfsops.c
src/sys/miscfs/specfs: spec_vnops.c
Log Message:
Redo previous again, v_specnode is invariant but not unique.
Set "vp->v_data = vp" and use v_data as key.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/miscfs/deadfs/dead_vfsops.c
cvs rdiff -u -r1.151 -r1.152 src/sys/miscfs/specfs/spec_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/deadfs/dead_vfsops.c
diff -u src/sys/miscfs/deadfs/dead_vfsops.c:1.5 src/sys/miscfs/deadfs/dead_vfsops.c:1.6
--- src/sys/miscfs/deadfs/dead_vfsops.c:1.5 Mon Jun 29 16:48:20 2015
+++ src/sys/miscfs/deadfs/dead_vfsops.c Tue Jun 30 06:19:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dead_vfsops.c,v 1.5 2015/06/29 16:48:20 hannken Exp $ */
+/* $NetBSD: dead_vfsops.c,v 1.6 2015/06/30 06:19:22 hannken Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dead_vfsops.c,v 1.5 2015/06/29 16:48:20 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dead_vfsops.c,v 1.6 2015/06/30 06:19:22 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,8 +108,9 @@ dead_newvnode(struct mount *mp, struct v
uvm_vnp_setsize(vp, 0);
spec_node_init(vp, vap->va_rdev);
- *key_len = sizeof(vp->v_specnode);
- *new_key = &vp->v_specnode;
+ vp->v_data = vp;
+ *key_len = sizeof(vp->v_data);
+ *new_key = &vp->v_data;
return 0;
}
Index: src/sys/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.151 src/sys/miscfs/specfs/spec_vnops.c:1.152
--- src/sys/miscfs/specfs/spec_vnops.c:1.151 Mon Jun 29 16:48:20 2015
+++ src/sys/miscfs/specfs/spec_vnops.c Tue Jun 30 06:19:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: spec_vnops.c,v 1.151 2015/06/29 16:48:20 hannken Exp $ */
+/* $NetBSD: spec_vnops.c,v 1.152 2015/06/30 06:19:21 hannken Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.151 2015/06/29 16:48:20 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.152 2015/06/30 06:19:21 hannken Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -1097,7 +1097,8 @@ spec_reclaim(void *v)
struct vnode *vp = ap->a_vp;
KASSERT(vp->v_mount == dead_rootmount);
- vcache_remove(vp->v_mount, &vp->v_specnode, sizeof(vp->v_specnode));
+ vcache_remove(vp->v_mount, &vp->v_data, sizeof(vp->v_data));
+ vp->v_data = NULL;
return 0;
}
