[src/trunk]: src/sys/miscfs/fdesc The comment about toxicity was correct, res...

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

details:   https://anonhg.NetBSD.org/src/rev/59230b7ab71c
branches:  trunk
changeset: 802203:59230b7ab71c
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 05 10:43:26 2014 +0000

description:
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 |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 134b2a7cdd30 -r 59230b7ab71c sys/miscfs/fdesc/fdesc_vnops.c
--- a/sys/miscfs/fdesc/fdesc_vnops.c    Fri Sep 05 09:40:44 2014 +0000
+++ b/sys/miscfs/fdesc/fdesc_vnops.c    Fri Sep 05 10:43:26 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fdesc_vnops.c,v 1.124 2014/09/05 09:26:16 matt Exp $   */
+/*     $NetBSD: fdesc_vnops.c,v 1.125 2014/09/05 10:43:26 christos Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.124 2014/09/05 09:26:16 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.125 2014/09/05 10:43:26 christos 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;
 }
 
@@ -838,7 +840,6 @@
                struct vnode *a_vp;
        } */ *ap = v;
        struct vnode *vp = ap->a_vp;
-#if 0
        struct fdescnode *fd = VTOFDESC(vp);
 
        /*
@@ -847,7 +848,6 @@
         */
        if (fd->fd_type == Fctty || fd->fd_type == Fdesc)
                vp->v_type = VNON;
-#endif
        VOP_UNLOCK(vp);
        return (0);
 }