[src/netbsd-7]: src/sys/miscfs/fdesc Pull up following revision(s) (requested...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c52db0146e7
branches:  netbsd-7
changeset: 799315:8c52db0146e7
user:      snj <snj%NetBSD.org@localhost>
date:      Wed May 13 19:16:14 2015 +0000

description:
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.

diffstat:

 sys/miscfs/fdesc/fdesc_vnops.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 85d1ab216f4a -r 8c52db0146e7 sys/miscfs/fdesc/fdesc_vnops.c
--- a/sys/miscfs/fdesc/fdesc_vnops.c    Wed May 13 17:30:57 2015 +0000
+++ b/sys/miscfs/fdesc/fdesc_vnops.c    Wed May 13 19:16:14 2015 +0000
@@ -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 @@
 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;
 }