Module Name: src
Committed By: snj
Date: Wed May 13 19:16:14 UTC 2015
Modified Files:
src/sys/miscfs/fdesc [netbsd-7]: fdesc_vnops.c
Log Message:
Pull up following revision(s) (requested by riz in ticket #737):
sys/miscfs/fdesc/fdesc_vnops.c: revision 1.125 via patch
The comment about toxicity was correct, restore VNON setting code and
then set the proper type in lookup.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.121.2.1 src/sys/miscfs/fdesc/fdesc_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/fdesc/fdesc_vnops.c
diff -u src/sys/miscfs/fdesc/fdesc_vnops.c:1.121 src/sys/miscfs/fdesc/fdesc_vnops.c:1.121.2.1
--- src/sys/miscfs/fdesc/fdesc_vnops.c:1.121 Fri Jul 25 08:20:52 2014
+++ src/sys/miscfs/fdesc/fdesc_vnops.c Wed May 13 19:16:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vnops.c,v 1.121 2014/07/25 08:20:52 dholland Exp $ */
+/* $NetBSD: fdesc_vnops.c,v 1.121.2.1 2015/05/13 19:16:14 snj Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.121 2014/07/25 08:20:52 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.121.2.1 2015/05/13 19:16:14 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -295,6 +295,8 @@ bad:
good:
KASSERT(ix != -1);
error = vcache_get(dvp->v_mount, &ix, sizeof(ix), vpp);
+ if (error == 0 && ix == FD_CTTY)
+ (*vpp)->v_type = VCHR;
return error;
}
