Module Name: src
Committed By: hannken
Date: Mon Jun 29 16:48:20 UTC 2015
Modified Files:
src/sys/miscfs/deadfs: dead_vfsops.c
src/sys/miscfs/specfs: spec_vnops.c
Log Message:
Use the address of vp->v_specnode as vcache key. It is invariant
over the lifetime of the vnode.
The previous worked by luck, it took the first sizeof(void *) bytes
of struct vnode as key.
Resolves CID 1308957: wrong sizeof()
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/miscfs/deadfs/dead_vfsops.c
cvs rdiff -u -r1.150 -r1.151 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.4 src/sys/miscfs/deadfs/dead_vfsops.c:1.5
--- src/sys/miscfs/deadfs/dead_vfsops.c:1.4 Tue Jun 23 10:42:34 2015
+++ src/sys/miscfs/deadfs/dead_vfsops.c Mon Jun 29 16:48:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dead_vfsops.c,v 1.4 2015/06/23 10:42:34 hannken Exp $ */
+/* $NetBSD: dead_vfsops.c,v 1.5 2015/06/29 16:48:20 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.4 2015/06/23 10:42:34 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dead_vfsops.c,v 1.5 2015/06/29 16:48:20 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,8 +108,8 @@ dead_newvnode(struct mount *mp, struct v
uvm_vnp_setsize(vp, 0);
spec_node_init(vp, vap->va_rdev);
- *key_len = sizeof(struct vnode *);
- *new_key = vp;
+ *key_len = sizeof(vp->v_specnode);
+ *new_key = &vp->v_specnode;
return 0;
}
Index: src/sys/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.150 src/sys/miscfs/specfs/spec_vnops.c:1.151
--- src/sys/miscfs/specfs/spec_vnops.c:1.150 Mon Jun 29 16:25:49 2015
+++ src/sys/miscfs/specfs/spec_vnops.c Mon Jun 29 16:48:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: spec_vnops.c,v 1.150 2015/06/29 16:25:49 christos Exp $ */
+/* $NetBSD: spec_vnops.c,v 1.151 2015/06/29 16:48:20 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.150 2015/06/29 16:25:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.151 2015/06/29 16:48:20 hannken Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -1097,12 +1097,7 @@ spec_reclaim(void *v)
struct vnode *vp = ap->a_vp;
KASSERT(vp->v_mount == dead_rootmount);
- /*
- * The key is the pointer itself, see:
- * miscfs/deadfs/dead_vfsops::dead_newvnode()
- * coverity[sizeof_mismatch]
- */
- vcache_remove(vp->v_mount, vp, sizeof(struct vnode *));
+ vcache_remove(vp->v_mount, &vp->v_specnode, sizeof(vp->v_specnode));
return 0;
}
