Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/miscfs/kernfs/kernfs_vnops.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/miscfs/kernfs/kernfs_vnops.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.156 retrieving revision 1.157 diff -u -p -r1.156 -r1.157 --- src/sys/miscfs/kernfs/kernfs_vnops.c 2016/08/20 12:37:09 1.156 +++ src/sys/miscfs/kernfs/kernfs_vnops.c 2017/04/11 14:25:01 1.157 @@ -1,4 +1,4 @@ -/* $NetBSD: kernfs_vnops.c,v 1.156 2016/08/20 12:37:09 hannken Exp $ */ +/* $NetBSD: kernfs_vnops.c,v 1.157 2017/04/11 14:25:01 riastradh Exp $ */ /* * Copyright (c) 1992, 1993 @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.156 2016/08/20 12:37:09 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.157 2017/04/11 14:25:01 riastradh Exp $"); #include #include @@ -1061,14 +1061,13 @@ kernfs_readdir(void *v) int kernfs_inactive(void *v) { - struct vop_inactive_args /* { + struct vop_inactive_v2_args /* { struct vnode *a_vp; bool *a_recycle; } */ *ap = v; - struct vnode *vp = ap->a_vp; *ap->a_recycle = false; - VOP_UNLOCK(vp); + return (0); }