CVS commit: src/sys/miscfs/fdesc

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Thu Sep  4 13:28:54 UTC 2014

Modified Files:
        src/sys/miscfs/fdesc: fdesc_vnops.c

Log Message:
Well, nasty thing happen if you set /dev/tty to VNON too. Disable for now.


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 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.122
--- src/sys/miscfs/fdesc/fdesc_vnops.c:1.121	Fri Jul 25 04:20:52 2014
+++ src/sys/miscfs/fdesc/fdesc_vnops.c	Thu Sep  4 09:28:54 2014
@@ -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.122 2014/09/04 13:28:54 christos 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.122 2014/09/04 13:28:54 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -295,6 +295,7 @@ bad:
 good:
 	KASSERT(ix != -1);
 	error = vcache_get(dvp->v_mount, &ix, sizeof(ix), vpp);
+printf("%s, %d: %d %d %p\n", __FILE__, __LINE__, error, ix, vpp);
 	return error;
 }
 
@@ -354,6 +355,7 @@ fdesc_attr(int fd, struct vattr *vap, ka
 			 */
 			vap->va_mode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
 		}
+printf("%s, %d: %d %d\n", __FILE__, __LINE__, error, vap->va_type);
 		break;
 
 	default:
@@ -390,6 +392,7 @@ fdesc_attr(int fd, struct vattr *vap, ka
 		vap->va_flags = stb.st_flags;
 		vap->va_rdev = stb.st_rdev;
 		vap->va_bytes = stb.st_blocks * stb.st_blksize;
+printf("%s, %d: %d %lld\n", __FILE__, __LINE__, error, (long long)vap->va_rdev);
 		break;
 	}
 
@@ -764,10 +767,12 @@ fdesc_ioctl(void *v)
 	} */ *ap = v;
 	int error = EOPNOTSUPP;
 
+printf("%s, %d: ioctl %d\n", __FILE__, __LINE__, VTOFDESC(ap->a_vp)->fd_type);
 	switch (VTOFDESC(ap->a_vp)->fd_type) {
 	case Fctty:
 		error = cdev_ioctl(devctty, ap->a_command, ap->a_data,
 		    ap->a_fflag, curlwp);
+printf("%s, %d: ioctl error %d\n", __FILE__, __LINE__, error);
 		break;
 
 	default:
@@ -838,6 +843,7 @@ fdesc_inactive(void *v)
 		struct vnode *a_vp;
 	} */ *ap = v;
 	struct vnode *vp = ap->a_vp;
+#if 0
 	struct fdescnode *fd = VTOFDESC(vp);
 
 	/*
@@ -846,6 +852,7 @@ fdesc_inactive(void *v)
 	 */
 	if (fd->fd_type == Fctty || fd->fd_type == Fdesc)
 		vp->v_type = VNON;
+#endif
 	VOP_UNLOCK(vp);
 	return (0);
 }