Module Name: src
Committed By: hannken
Date: Wed Jul 1 08:13:53 UTC 2015
Modified Files:
src/sys/miscfs/deadfs: dead_vfsops.c
src/sys/miscfs/specfs: spec_vnops.c
Log Message:
Unfortunately MFS uses v_data of its anonymous device vnode so
it cannot be used as vcache key. Use v_interlock as key ...
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/miscfs/deadfs/dead_vfsops.c
cvs rdiff -u -r1.152 -r1.153 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.6 src/sys/miscfs/deadfs/dead_vfsops.c:1.7
--- src/sys/miscfs/deadfs/dead_vfsops.c:1.6 Tue Jun 30 06:19:22 2015
+++ src/sys/miscfs/deadfs/dead_vfsops.c Wed Jul 1 08:13:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dead_vfsops.c,v 1.6 2015/06/30 06:19:22 hannken Exp $ */
+/* $NetBSD: dead_vfsops.c,v 1.7 2015/07/01 08:13:53 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.6 2015/06/30 06:19:22 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dead_vfsops.c,v 1.7 2015/07/01 08:13:53 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,9 +108,8 @@ dead_newvnode(struct mount *mp, struct v
uvm_vnp_setsize(vp, 0);
spec_node_init(vp, vap->va_rdev);
- vp->v_data = vp;
- *key_len = sizeof(vp->v_data);
- *new_key = &vp->v_data;
+ *key_len = sizeof(vp->v_interlock);
+ *new_key = &vp->v_interlock;
return 0;
}
Index: src/sys/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.152 src/sys/miscfs/specfs/spec_vnops.c:1.153
--- src/sys/miscfs/specfs/spec_vnops.c:1.152 Tue Jun 30 06:19:21 2015
+++ src/sys/miscfs/specfs/spec_vnops.c Wed Jul 1 08:13:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: spec_vnops.c,v 1.152 2015/06/30 06:19:21 hannken Exp $ */
+/* $NetBSD: spec_vnops.c,v 1.153 2015/07/01 08:13:52 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.152 2015/06/30 06:19:21 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.153 2015/07/01 08:13:52 hannken Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -1097,8 +1097,7 @@ spec_reclaim(void *v)
struct vnode *vp = ap->a_vp;
KASSERT(vp->v_mount == dead_rootmount);
- vcache_remove(vp->v_mount, &vp->v_data, sizeof(vp->v_data));
- vp->v_data = NULL;
+ vcache_remove(vp->v_mount, &vp->v_interlock, sizeof(vp->v_interlock));
return 0;
}
