Module Name: src
Committed By: christos
Date: Tue Oct 21 16:05:01 UTC 2014
Modified Files:
src/sys/fs/ptyfs: ptyfs_vfsops.c
Log Message:
Revert previous; it does not work with COMPAT_BSDPTY, screen(1) fails because
it does a TIOCPTSNAME immediately after opening ptmx and finds an old style pty.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/fs/ptyfs/ptyfs_vfsops.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/fs/ptyfs/ptyfs_vfsops.c
diff -u src/sys/fs/ptyfs/ptyfs_vfsops.c:1.54 src/sys/fs/ptyfs/ptyfs_vfsops.c:1.55
--- src/sys/fs/ptyfs/ptyfs_vfsops.c:1.54 Wed Oct 15 11:00:03 2014
+++ src/sys/fs/ptyfs/ptyfs_vfsops.c Tue Oct 21 12:05:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_vfsops.c,v 1.54 2014/10/15 15:00:03 christos Exp $ */
+/* $NetBSD: ptyfs_vfsops.c,v 1.55 2014/10/21 16:05:01 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.54 2014/10/15 15:00:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.55 2014/10/21 16:05:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -217,8 +217,7 @@ ptyfs__allocvp(struct mount *mp, struct
*vpp = NULL;
return error;
}
- /* Activate node only after we have grabbed device. */
- if (type == PTYFSpts)
+ if (type == PTYFSptc)
ptyfs_set_active(mp, minor(dev));
return 0;
}
