diff options
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/fdescfs/fdesc_vnops.c | 17 | ||||
| -rw-r--r-- | sys/fs/specfs/spec_vnops.c | 6 |
2 files changed, 11 insertions, 12 deletions
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index e4eaafc..bec6bc7 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $Id: fdesc_vnops.c,v 1.13 1995/12/03 14:54:10 bde Exp $ + * $Id: fdesc_vnops.c,v 1.14 1995/12/05 19:12:05 bde Exp $ */ /* @@ -58,8 +58,11 @@ #include <sys/dirent.h> #include <sys/socketvar.h> #include <sys/tty.h> +#include <sys/conf.h> #include <miscfs/fdesc/fdesc.h> +extern struct cdevsw ctty_cdevsw; + #define cttyvp(p) ((p)->p_flag & P_CONTROLT ? (p)->p_session->s_ttyvp : NULL) #define FDL_WANT 0x01 @@ -363,7 +366,7 @@ fdesc_open(ap) break; case Fctty: - error = cttyopen(devctty, ap->a_mode, 0, ap->a_p); + error = (*ctty_cdevsw.d_open)(devctty, ap->a_mode, 0, ap->a_p); break; } @@ -710,7 +713,7 @@ fdesc_read(ap) switch (VTOFDESC(ap->a_vp)->fd_type) { case Fctty: - error = cttyread(devctty, ap->a_uio, ap->a_ioflag); + error = (*ctty_cdevsw.d_read)(devctty, ap->a_uio, ap->a_ioflag); break; default: @@ -734,7 +737,7 @@ fdesc_write(ap) switch (VTOFDESC(ap->a_vp)->fd_type) { case Fctty: - error = cttywrite(devctty, ap->a_uio, ap->a_ioflag); + error = (*ctty_cdevsw.d_write)(devctty, ap->a_uio, ap->a_ioflag); break; default: @@ -760,8 +763,8 @@ fdesc_ioctl(ap) switch (VTOFDESC(ap->a_vp)->fd_type) { case Fctty: - error = cttyioctl(devctty, ap->a_command, ap->a_data, - ap->a_fflag, ap->a_p); + error = (*ctty_cdevsw.d_ioctl)(devctty, ap->a_command, + ap->a_data, ap->a_fflag, ap->a_p); break; default: @@ -786,7 +789,7 @@ fdesc_select(ap) switch (VTOFDESC(ap->a_vp)->fd_type) { case Fctty: - error = cttyselect(devctty, ap->a_fflags, ap->a_p); + error = (*ctty_cdevsw.d_select)(devctty, ap->a_fflags, ap->a_p); break; default: diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index 38e694e..3a04353 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.6 (Berkeley) 4/9/94 - * $Id: spec_vnops.c,v 1.20 1995/12/05 21:51:45 bde Exp $ + * $Id: spec_vnops.c,v 1.21 1995/12/07 12:47:17 davidg Exp $ */ #include <sys/param.h> @@ -159,10 +159,8 @@ spec_open(ap) case VCHR: if ((u_int)maj >= nchrdev) return (ENXIO); -#ifdef JREMOD if ( cdevsw[maj].d_open == NULL) return ENXIO; -#endif /*JREMOD*/ if (ap->a_cred != FSCRED && (ap->a_mode & FWRITE)) { /* * When running in very secure mode, do not allow @@ -194,10 +192,8 @@ spec_open(ap) case VBLK: if ((u_int)maj >= nblkdev) return (ENXIO); -#ifdef JREMOD if ( bdevsw[maj].d_open == NULL) return ENXIO; -#endif /*JREMOD*/ /* * When running in very secure mode, do not allow * opens for writing of any disk block devices. |
