diff options
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/deadfs/dead_vnops.c | 8 | ||||
| -rw-r--r-- | sys/miscfs/devfs/devfs_vnops.c | 115 | ||||
| -rw-r--r-- | sys/miscfs/fdesc/fdesc_vnops.c | 45 | ||||
| -rw-r--r-- | sys/miscfs/fifofs/fifo_vnops.c | 37 | ||||
| -rw-r--r-- | sys/miscfs/kernfs/kernfs_vnops.c | 59 | ||||
| -rw-r--r-- | sys/miscfs/portal/portal_vnops.c | 44 | ||||
| -rw-r--r-- | sys/miscfs/procfs/procfs_vnops.c | 65 | ||||
| -rw-r--r-- | sys/miscfs/specfs/spec_vnops.c | 47 | ||||
| -rw-r--r-- | sys/miscfs/union/union_vnops.c | 19 |
9 files changed, 18 insertions, 421 deletions
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index 3c41130..051977f 100644 --- a/sys/miscfs/deadfs/dead_vnops.c +++ b/sys/miscfs/deadfs/dead_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93 - * $Id: dead_vnops.c,v 1.17 1997/10/15 10:04:03 phk Exp $ + * $Id: dead_vnops.c,v 1.18 1997/10/16 10:48:06 phk Exp $ */ #include <sys/param.h> @@ -61,9 +61,7 @@ static struct vnodeopv_entry_desc dead_vnodeop_entries[] = { { &vop_access_desc, (vop_t *) dead_ebadf }, { &vop_advlock_desc, (vop_t *) dead_ebadf }, { &vop_bmap_desc, (vop_t *) dead_bmap }, - { &vop_close_desc, (vop_t *) nullop }, { &vop_create_desc, (vop_t *) dead_badop }, - { &vop_fsync_desc, (vop_t *) nullop }, { &vop_getattr_desc, (vop_t *) dead_ebadf }, { &vop_inactive_desc, (vop_t *) nullop }, { &vop_ioctl_desc, (vop_t *) dead_ioctl }, @@ -75,7 +73,7 @@ static struct vnodeopv_entry_desc dead_vnodeop_entries[] = { { &vop_mknod_desc, (vop_t *) dead_badop }, { &vop_mmap_desc, (vop_t *) dead_badop }, { &vop_open_desc, (vop_t *) dead_open }, - { &vop_pathconf_desc, (vop_t *) dead_ebadf }, + { &vop_pathconf_desc, (vop_t *) dead_ebadf }, /* per pathconf(2) */ { &vop_print_desc, (vop_t *) dead_print }, { &vop_read_desc, (vop_t *) dead_read }, { &vop_readdir_desc, (vop_t *) dead_ebadf }, @@ -84,11 +82,9 @@ static struct vnodeopv_entry_desc dead_vnodeop_entries[] = { { &vop_remove_desc, (vop_t *) dead_badop }, { &vop_rename_desc, (vop_t *) dead_badop }, { &vop_rmdir_desc, (vop_t *) dead_badop }, - { &vop_seek_desc, (vop_t *) nullop }, { &vop_setattr_desc, (vop_t *) dead_ebadf }, { &vop_symlink_desc, (vop_t *) dead_badop }, { &vop_unlock_desc, (vop_t *) vop_nounlock }, - { &vop_update_desc, (vop_t *) nullop }, { &vop_write_desc, (vop_t *) dead_write }, { NULL, NULL } }; diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c index 5ab722c..6bbf46d 100644 --- a/sys/miscfs/devfs/devfs_vnops.c +++ b/sys/miscfs/devfs/devfs_vnops.c @@ -1,7 +1,7 @@ /* * Written by Julian Elischer (julian@DIALix.oz.au) * - * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.43 1997/10/15 13:23:01 phk Exp $ + * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.44 1997/10/16 10:48:12 phk Exp $ * * symlinks can wait 'til later. */ @@ -346,34 +346,6 @@ DBPRINT(("mknod\n")); #endif /* notyet */ static int -devfs_open(struct vop_open_args *ap) - /*struct vop_open_args { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ -{ -DBPRINT(("open\n")); - return 0; -} - -#ifdef notyet -static int -devfs_close( struct vop_close_args *ap) - /*struct vop_close_args { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ -{ -DBPRINT(("close\n")); - return 0; -} -#endif /* notyet */ - -static int devfs_access(struct vop_access_args *ap) /*struct vop_access_args { struct vnode *a_vp; @@ -763,47 +735,7 @@ DBPRINT(("select\n")); return 1; /* filesystems never block? */ } -static int -devfs_mmap(struct vop_mmap_args *ap) - /*struct vop_mmap_args { - struct vnode *a_vp; - int a_fflags; - struct ucred *a_cred; - struct proc *a_p; - } */ -{ -DBPRINT(("mmap\n")); - return EINVAL; -} -/* - * Flush the blocks of a file to disk. - */ -static int -devfs_fsync(struct vop_fsync_args *ap) - /*struct vop_fsync_args { - struct vnode *a_vp; - struct ucred *a_cred; - int a_waitfor; - struct proc *a_p; - } */ -{ -DBPRINT(("fsync\n")); - return(0); -} - -static int -devfs_seek(struct vop_seek_args *ap) - /*struct vop_seek_args { - struct vnode *a_vp; - off_t a_oldoff; - off_t a_newoff; - struct ucred *a_cred; - } */ -{ -DBPRINT(("seek\n")); - return 0; -} #endif /* notyet */ static int @@ -1525,44 +1457,6 @@ DBPRINT(("reclaim\n")); } /* - * Return POSIX pathconf information applicable to special devices. - */ -static int -devfs_pathconf(struct vop_pathconf_args *ap) - /*struct vop_pathconf_args { - struct vnode *a_vp; - int a_name; - int *a_retval; - } */ -{ - - switch (ap->a_name) { - case _PC_LINK_MAX: - *ap->a_retval = LINK_MAX; - return (0); - case _PC_MAX_CANON: - *ap->a_retval = MAX_CANON; - return (0); - case _PC_MAX_INPUT: - *ap->a_retval = MAX_INPUT; - return (0); - case _PC_PIPE_BUF: - *ap->a_retval = PIPE_BUF; - return (0); - case _PC_CHOWN_RESTRICTED: - *ap->a_retval = 1; - return (0); - case _PC_VDISABLE: - *ap->a_retval = _POSIX_VDISABLE; - return (0); - default: - return (EINVAL); - } - /* NOTREACHED */ -} - - -/* * Print out the contents of a /devfs vnode. */ static int @@ -1629,19 +1523,15 @@ devfs_dropvnode(dn_p dnp) vop_t **devfs_vnodeop_p; static struct vnodeopv_entry_desc devfs_vnodeop_entries[] = { { &vop_default_desc, (vop_t *) vn_default_error }, - { &vop_abortop_desc, (vop_t *) nullop }, { &vop_access_desc, (vop_t *) devfs_access }, { &vop_bmap_desc, (vop_t *) devfs_badop }, - { &vop_close_desc, (vop_t *) nullop }, - { &vop_fsync_desc, (vop_t *) nullop }, { &vop_getattr_desc, (vop_t *) devfs_getattr }, { &vop_inactive_desc, (vop_t *) devfs_inactive }, { &vop_islocked_desc, (vop_t *) vop_noislocked }, { &vop_link_desc, (vop_t *) devfs_link }, { &vop_lock_desc, (vop_t *) vop_nolock }, { &vop_lookup_desc, (vop_t *) devfs_lookup }, - { &vop_open_desc, (vop_t *) devfs_open }, - { &vop_pathconf_desc, (vop_t *) devfs_pathconf }, + { &vop_pathconf_desc, (vop_t *) vop_stdpathconf }, { &vop_print_desc, (vop_t *) devfs_print }, { &vop_read_desc, (vop_t *) devfs_read }, { &vop_readdir_desc, (vop_t *) devfs_readdir }, @@ -1649,7 +1539,6 @@ static struct vnodeopv_entry_desc devfs_vnodeop_entries[] = { { &vop_reclaim_desc, (vop_t *) devfs_reclaim }, { &vop_remove_desc, (vop_t *) devfs_remove }, { &vop_rename_desc, (vop_t *) devfs_rename }, - { &vop_seek_desc, (vop_t *) nullop }, { &vop_setattr_desc, (vop_t *) devfs_setattr }, { &vop_symlink_desc, (vop_t *) devfs_symlink }, { &vop_unlock_desc, (vop_t *) vop_nounlock }, diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c index 7793177..ccc5e5b 100644 --- a/sys/miscfs/fdesc/fdesc_vnops.c +++ b/sys/miscfs/fdesc/fdesc_vnops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $Id: fdesc_vnops.c,v 1.28 1997/10/15 10:04:12 phk Exp $ + * $Id: fdesc_vnops.c,v 1.29 1997/10/16 10:48:18 phk Exp $ */ /* @@ -91,7 +91,6 @@ static int fdesc_inactive __P((struct vop_inactive_args *ap)); static int fdesc_ioctl __P((struct vop_ioctl_args *ap)); static int fdesc_lookup __P((struct vop_lookup_args *ap)); static int fdesc_open __P((struct vop_open_args *ap)); -static int fdesc_pathconf __P((struct vop_pathconf_args *ap)); static int fdesc_print __P((struct vop_print_args *ap)); static int fdesc_read __P((struct vop_read_args *ap)); static int fdesc_readdir __P((struct vop_readdir_args *ap)); @@ -831,43 +830,6 @@ fdesc_reclaim(ap) } /* - * Return POSIX pathconf information applicable to special devices. - */ -static int -fdesc_pathconf(ap) - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - int *a_retval; - } */ *ap; -{ - - switch (ap->a_name) { - case _PC_LINK_MAX: - *ap->a_retval = LINK_MAX; - return (0); - case _PC_MAX_CANON: - *ap->a_retval = MAX_CANON; - return (0); - case _PC_MAX_INPUT: - *ap->a_retval = MAX_INPUT; - return (0); - case _PC_PIPE_BUF: - *ap->a_retval = PIPE_BUF; - return (0); - case _PC_CHOWN_RESTRICTED: - *ap->a_retval = 1; - return (0); - case _PC_VDISABLE: - *ap->a_retval = _POSIX_VDISABLE; - return (0); - default: - return (EINVAL); - } - /* NOTREACHED */ -} - -/* * Print out the contents of a /dev/fd vnode. */ /* ARGSUSED */ @@ -897,8 +859,6 @@ static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = { { &vop_default_desc, (vop_t *) vn_default_error }, { &vop_access_desc, (vop_t *) nullop }, { &vop_bmap_desc, (vop_t *) fdesc_badop }, - { &vop_close_desc, (vop_t *) nullop }, - { &vop_fsync_desc, (vop_t *) nullop }, { &vop_getattr_desc, (vop_t *) fdesc_getattr }, { &vop_inactive_desc, (vop_t *) fdesc_inactive }, { &vop_ioctl_desc, (vop_t *) fdesc_ioctl }, @@ -906,14 +866,13 @@ static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = { { &vop_lock_desc, (vop_t *) vop_nolock }, { &vop_lookup_desc, (vop_t *) fdesc_lookup }, { &vop_open_desc, (vop_t *) fdesc_open }, - { &vop_pathconf_desc, (vop_t *) fdesc_pathconf }, + { &vop_pathconf_desc, (vop_t *) vop_stdpathconf }, { &vop_poll_desc, (vop_t *) fdesc_poll }, { &vop_print_desc, (vop_t *) fdesc_print }, { &vop_read_desc, (vop_t *) fdesc_read }, { &vop_readdir_desc, (vop_t *) fdesc_readdir }, { &vop_readlink_desc, (vop_t *) fdesc_readlink }, { &vop_reclaim_desc, (vop_t *) fdesc_reclaim }, - { &vop_seek_desc, (vop_t *) nullop }, { &vop_setattr_desc, (vop_t *) fdesc_setattr }, { &vop_unlock_desc, (vop_t *) vop_nounlock }, { &vop_write_desc, (vop_t *) fdesc_write }, diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index 0b157a54..8c46042 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/sys/miscfs/fifofs/fifo_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $Id: fifo_vnops.c,v 1.31 1997/10/15 13:23:12 phk Exp $ + * $Id: fifo_vnops.c,v 1.32 1997/10/16 10:48:25 phk Exp $ */ #include <sys/param.h> @@ -72,7 +72,6 @@ static int fifo_ioctl __P((struct vop_ioctl_args *)); static int fifo_poll __P((struct vop_poll_args *)); static int fifo_inactive __P((struct vop_inactive_args *)); static int fifo_bmap __P((struct vop_bmap_args *)); -static int fifo_pathconf __P((struct vop_pathconf_args *)); static int fifo_advlock __P((struct vop_advlock_args *)); @@ -85,7 +84,6 @@ static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { { &vop_bmap_desc, (vop_t *) fifo_bmap }, { &vop_close_desc, (vop_t *) fifo_close }, { &vop_create_desc, (vop_t *) fifo_badop }, - { &vop_fsync_desc, (vop_t *) nullop }, { &vop_getattr_desc, (vop_t *) fifo_ebadf }, { &vop_inactive_desc, (vop_t *) fifo_inactive }, { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, @@ -96,9 +94,8 @@ static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { { &vop_lookup_desc, (vop_t *) fifo_lookup }, { &vop_mkdir_desc, (vop_t *) fifo_badop }, { &vop_mknod_desc, (vop_t *) fifo_badop }, - { &vop_mmap_desc, (vop_t *) fifo_badop }, { &vop_open_desc, (vop_t *) fifo_open }, - { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_pathconf_desc, (vop_t *) vop_stdpathconf }, { &vop_poll_desc, (vop_t *) fifo_poll }, { &vop_print_desc, (vop_t *) fifo_print }, { &vop_read_desc, (vop_t *) fifo_read }, @@ -109,11 +106,9 @@ static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { { &vop_remove_desc, (vop_t *) fifo_badop }, { &vop_rename_desc, (vop_t *) fifo_badop }, { &vop_rmdir_desc, (vop_t *) fifo_badop }, - { &vop_seek_desc, (vop_t *) fifo_badop }, { &vop_setattr_desc, (vop_t *) fifo_ebadf }, { &vop_symlink_desc, (vop_t *) fifo_badop }, { &vop_unlock_desc, (vop_t *) vop_nounlock }, - { &vop_update_desc, (vop_t *) nullop }, { &vop_write_desc, (vop_t *) fifo_write }, { NULL, NULL } }; @@ -493,34 +488,6 @@ fifo_print(ap) } /* - * Return POSIX pathconf information applicable to fifo's. - */ -static int -fifo_pathconf(ap) - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - int *a_retval; - } */ *ap; -{ - - switch (ap->a_name) { - case _PC_LINK_MAX: - *ap->a_retval = LINK_MAX; - return (0); - case _PC_PIPE_BUF: - *ap->a_retval = PIPE_BUF; - return (0); - case _PC_CHOWN_RESTRICTED: - *ap->a_retval = 1; - return (0); - default: - return (EINVAL); - } - /* NOTREACHED */ -} - -/* * Fifo failed operation */ static int diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c index 3eea65c..578094f 100644 --- a/sys/miscfs/kernfs/kernfs_vnops.c +++ b/sys/miscfs/kernfs/kernfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 - * $Id: kernfs_vnops.c,v 1.23 1997/10/15 10:04:23 phk Exp $ + * $Id: kernfs_vnops.c,v 1.24 1997/10/16 10:48:29 phk Exp $ */ /* @@ -109,7 +109,6 @@ static int kernfs_enotsupp __P((void)); static int kernfs_getattr __P((struct vop_getattr_args *ap)); static int kernfs_inactive __P((struct vop_inactive_args *ap)); static int kernfs_lookup __P((struct vop_lookup_args *ap)); -static int kernfs_open __P((struct vop_open_args *ap)); static int kernfs_pathconf __P((struct vop_pathconf_args *ap)); static int kernfs_print __P((struct vop_print_args *ap)); static int kernfs_read __P((struct vop_read_args *ap)); @@ -316,20 +315,6 @@ found: } static int -kernfs_open(ap) - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - - /* Only need to check access permissions. */ - return (0); -} - -static int kernfs_access(ap) struct vop_access_args /* { struct vnode *a_vp; @@ -636,42 +621,6 @@ kernfs_reclaim(ap) return (0); } -/* - * Return POSIX pathconf information applicable to special devices. - */ -static int -kernfs_pathconf(ap) - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - int *a_retval; - } */ *ap; -{ - - switch (ap->a_name) { - case _PC_LINK_MAX: - *ap->a_retval = LINK_MAX; - return (0); - case _PC_MAX_CANON: - *ap->a_retval = MAX_CANON; - return (0); - case _PC_MAX_INPUT: - *ap->a_retval = MAX_INPUT; - return (0); - case _PC_PIPE_BUF: - *ap->a_retval = PIPE_BUF; - return (0); - case _PC_CHOWN_RESTRICTED: - *ap->a_retval = 1; - return (0); - case _PC_VDISABLE: - *ap->a_retval = _POSIX_VDISABLE; - return (0); - default: - return (EINVAL); - } - /* NOTREACHED */ -} /* * Print out the contents of a kernfs vnode. @@ -703,20 +652,16 @@ static struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = { { &vop_default_desc, (vop_t *) vn_default_error }, { &vop_access_desc, (vop_t *) kernfs_access }, { &vop_bmap_desc, (vop_t *) kernfs_badop }, - { &vop_close_desc, (vop_t *) nullop }, - { &vop_fsync_desc, (vop_t *) nullop }, { &vop_getattr_desc, (vop_t *) kernfs_getattr }, { &vop_inactive_desc, (vop_t *) kernfs_inactive }, { &vop_islocked_desc, (vop_t *) vop_noislocked }, { &vop_lock_desc, (vop_t *) vop_nolock }, { &vop_lookup_desc, (vop_t *) kernfs_lookup }, - { &vop_open_desc, (vop_t *) kernfs_open }, - { &vop_pathconf_desc, (vop_t *) kernfs_pathconf }, + { &vop_pathconf_desc, (vop_t *) vop_stdpathconf }, { &vop_print_desc, (vop_t *) kernfs_print }, { &vop_read_desc, (vop_t *) kernfs_read }, { &vop_readdir_desc, (vop_t *) kernfs_readdir }, { &vop_reclaim_desc, (vop_t *) kernfs_reclaim }, - { &vop_seek_desc, (vop_t *) nullop }, { &vop_setattr_desc, (vop_t *) kernfs_setattr }, { &vop_unlock_desc, (vop_t *) vop_nounlock }, { &vop_write_desc, (vop_t *) kernfs_write }, diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c index d8c2230..df35f0c 100644 --- a/sys/miscfs/portal/portal_vnops.c +++ b/sys/miscfs/portal/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95 * - * $Id: portal_vnops.c,v 1.23 1997/10/15 10:04:34 phk Exp $ + * $Id: portal_vnops.c,v 1.24 1997/10/16 10:48:35 phk Exp $ */ /* @@ -73,7 +73,6 @@ static int portal_getattr __P((struct vop_getattr_args *ap)); static int portal_inactive __P((struct vop_inactive_args *ap)); static int portal_lookup __P((struct vop_lookup_args *ap)); static int portal_open __P((struct vop_open_args *ap)); -static int portal_pathconf __P((struct vop_pathconf_args *ap)); static int portal_print __P((struct vop_print_args *ap)); static int portal_readdir __P((struct vop_readdir_args *ap)); static int portal_reclaim __P((struct vop_reclaim_args *ap)); @@ -559,42 +558,6 @@ portal_reclaim(ap) return (0); } -/* - * Return POSIX pathconf information applicable to special devices. - */ -static int -portal_pathconf(ap) - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - int *a_retval; - } */ *ap; -{ - - switch (ap->a_name) { - case _PC_LINK_MAX: - *ap->a_retval = LINK_MAX; - return (0); - case _PC_MAX_CANON: - *ap->a_retval = MAX_CANON; - return (0); - case _PC_MAX_INPUT: - *ap->a_retval = MAX_INPUT; - return (0); - case _PC_PIPE_BUF: - *ap->a_retval = PIPE_BUF; - return (0); - case _PC_CHOWN_RESTRICTED: - *ap->a_retval = 1; - return (0); - case _PC_VDISABLE: - *ap->a_retval = _POSIX_VDISABLE; - return (0); - default: - return (EINVAL); - } - /* NOTREACHED */ -} /* * Print out the contents of a Portal vnode. @@ -638,19 +601,16 @@ static struct vnodeopv_entry_desc portal_vnodeop_entries[] = { { &vop_default_desc, (vop_t *) vn_default_error }, { &vop_access_desc, (vop_t *) nullop }, { &vop_bmap_desc, (vop_t *) portal_badop }, - { &vop_close_desc, (vop_t *) nullop }, - { &vop_fsync_desc, (vop_t *) nullop }, { &vop_getattr_desc, (vop_t *) portal_getattr }, { &vop_inactive_desc, (vop_t *) portal_inactive }, { &vop_islocked_desc, (vop_t *) vop_noislocked }, { &vop_lock_desc, (vop_t *) vop_nolock }, { &vop_lookup_desc, (vop_t *) portal_lookup }, { &vop_open_desc, (vop_t *) portal_open }, - { &vop_pathconf_desc, (vop_t *) portal_pathconf }, + { &vop_pathconf_desc, (vop_t *) vop_stdpathconf }, { &vop_print_desc, (vop_t *) portal_print }, { &vop_readdir_desc, (vop_t *) portal_readdir }, { &vop_reclaim_desc, (vop_t *) portal_reclaim }, - { &vop_seek_desc, (vop_t *) nullop }, { &vop_setattr_desc, (vop_t *) portal_setattr }, { &vop_unlock_desc, (vop_t *) vop_nounlock }, { NULL, NULL } diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index ab62a4d..8caf5fe 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95 * - * $Id: procfs_vnops.c,v 1.35 1997/10/15 10:04:38 phk Exp $ + * $Id: procfs_vnops.c,v 1.36 1997/10/16 10:48:40 phk Exp $ */ /* @@ -64,10 +64,8 @@ static int procfs_bmap __P((struct vop_bmap_args *)); static int procfs_close __P((struct vop_close_args *)); static int procfs_getattr __P((struct vop_getattr_args *)); static int procfs_inactive __P((struct vop_inactive_args *)); -static int procfs_ioctl __P((struct vop_ioctl_args *)); static int procfs_lookup __P((struct vop_lookup_args *)); static int procfs_open __P((struct vop_open_args *)); -static int procfs_pathconf __P((struct vop_pathconf_args *ap)); static int procfs_print __P((struct vop_print_args *)); static int procfs_readdir __P((struct vop_readdir_args *)); static int procfs_readlink __P((struct vop_readlink_args *)); @@ -185,24 +183,6 @@ procfs_close(ap) } /* - * do an ioctl operation on pfsnode (vp). - * (vp) is not locked on entry or exit. - */ -static int -procfs_ioctl(ap) - struct vop_ioctl_args /* { - struct vnode *a_vp; - int a_command; - caddr_t a_data; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - return (ENOTTY); -} - -/* * do block mapping for pfsnode (vp). * since we don't use the buffer cache * for procfs this function should never @@ -282,43 +262,6 @@ procfs_reclaim(ap) } /* - * Return POSIX pathconf information applicable to special devices. - */ -static int -procfs_pathconf(ap) - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - int *a_retval; - } */ *ap; -{ - - switch (ap->a_name) { - case _PC_LINK_MAX: - *ap->a_retval = LINK_MAX; - return (0); - case _PC_MAX_CANON: - *ap->a_retval = MAX_CANON; - return (0); - case _PC_MAX_INPUT: - *ap->a_retval = MAX_INPUT; - return (0); - case _PC_PIPE_BUF: - *ap->a_retval = PIPE_BUF; - return (0); - case _PC_CHOWN_RESTRICTED: - *ap->a_retval = 1; - return (0); - case _PC_VDISABLE: - *ap->a_retval = _POSIX_VDISABLE; - return (0); - default: - return (EINVAL); - } - /* NOTREACHED */ -} - -/* * _print is used for debugging. * just print a readable description * of (vp). @@ -950,16 +893,14 @@ static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = { { &vop_create_desc, (vop_t *) procfs_badop }, { &vop_getattr_desc, (vop_t *) procfs_getattr }, { &vop_inactive_desc, (vop_t *) procfs_inactive }, - { &vop_ioctl_desc, (vop_t *) procfs_ioctl }, { &vop_islocked_desc, (vop_t *) vop_noislocked }, { &vop_link_desc, (vop_t *) procfs_badop }, { &vop_lock_desc, (vop_t *) vop_nolock }, { &vop_lookup_desc, (vop_t *) procfs_lookup }, { &vop_mkdir_desc, (vop_t *) procfs_badop }, { &vop_mknod_desc, (vop_t *) procfs_badop }, - { &vop_mmap_desc, (vop_t *) procfs_badop }, { &vop_open_desc, (vop_t *) procfs_open }, - { &vop_pathconf_desc, (vop_t *) procfs_pathconf }, + { &vop_pathconf_desc, (vop_t *) vop_stdpathconf }, { &vop_print_desc, (vop_t *) procfs_print }, { &vop_read_desc, (vop_t *) procfs_rw }, { &vop_readdir_desc, (vop_t *) procfs_readdir }, @@ -968,11 +909,9 @@ static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = { { &vop_remove_desc, (vop_t *) procfs_badop }, { &vop_rename_desc, (vop_t *) procfs_badop }, { &vop_rmdir_desc, (vop_t *) procfs_badop }, - { &vop_seek_desc, (vop_t *) procfs_badop }, { &vop_setattr_desc, (vop_t *) procfs_setattr }, { &vop_symlink_desc, (vop_t *) procfs_badop }, { &vop_unlock_desc, (vop_t *) vop_nounlock }, - { &vop_update_desc, (vop_t *) nullop }, { &vop_write_desc, (vop_t *) procfs_rw }, { NULL, NULL } }; diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index 12a9f29..bdf769b 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $Id: spec_vnops.c,v 1.46 1997/10/15 13:23:18 phk Exp $ + * $Id: spec_vnops.c,v 1.47 1997/10/16 10:48:46 phk Exp $ */ #include <sys/param.h> @@ -73,7 +73,6 @@ static int spec_poll __P((struct vop_poll_args *)); static int spec_inactive __P((struct vop_inactive_args *)); static int spec_fsync __P((struct vop_fsync_args *)); static int spec_bmap __P((struct vop_bmap_args *)); -static int spec_pathconf __P((struct vop_pathconf_args *)); static int spec_advlock __P((struct vop_advlock_args *)); static int spec_getpages __P((struct vop_getpages_args *)); @@ -98,9 +97,8 @@ static struct vnodeopv_entry_desc spec_vnodeop_entries[] = { { &vop_lookup_desc, (vop_t *) spec_lookup }, { &vop_mkdir_desc, (vop_t *) spec_badop }, { &vop_mknod_desc, (vop_t *) spec_badop }, - { &vop_mmap_desc, (vop_t *) spec_badop }, { &vop_open_desc, (vop_t *) spec_open }, - { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_pathconf_desc, (vop_t *) vop_stdpathconf }, { &vop_poll_desc, (vop_t *) spec_poll }, { &vop_print_desc, (vop_t *) spec_print }, { &vop_read_desc, (vop_t *) spec_read }, @@ -111,12 +109,10 @@ static struct vnodeopv_entry_desc spec_vnodeop_entries[] = { { &vop_remove_desc, (vop_t *) spec_badop }, { &vop_rename_desc, (vop_t *) spec_badop }, { &vop_rmdir_desc, (vop_t *) spec_badop }, - { &vop_seek_desc, (vop_t *) spec_badop }, { &vop_setattr_desc, (vop_t *) spec_ebadf }, { &vop_strategy_desc, (vop_t *) spec_strategy }, { &vop_symlink_desc, (vop_t *) spec_badop }, { &vop_unlock_desc, (vop_t *) vop_nounlock }, - { &vop_update_desc, (vop_t *) nullop }, { &vop_write_desc, (vop_t *) spec_write }, { NULL, NULL } }; @@ -473,7 +469,7 @@ spec_poll(ap) dev = ap->a_vp->v_rdev; return (*cdevsw[major(dev)]->d_poll)(dev, ap->a_events, ap->a_p); default: - return (vn_defaultop((struct vop_generic_args *)ap)); + return (vop_defaultop((struct vop_generic_args *)ap)); } } @@ -686,43 +682,6 @@ spec_print(ap) } /* - * Return POSIX pathconf information applicable to special devices. - */ -static int -spec_pathconf(ap) - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - int *a_retval; - } */ *ap; -{ - - switch (ap->a_name) { - case _PC_LINK_MAX: - *ap->a_retval = LINK_MAX; - return (0); - case _PC_MAX_CANON: - *ap->a_retval = MAX_CANON; - return (0); - case _PC_MAX_INPUT: - *ap->a_retval = MAX_INPUT; - return (0); - case _PC_PIPE_BUF: - *ap->a_retval = PIPE_BUF; - return (0); - case _PC_CHOWN_RESTRICTED: - *ap->a_retval = 1; - return (0); - case _PC_VDISABLE: - *ap->a_retval = _POSIX_VDISABLE; - return (0); - default: - return (EINVAL); - } - /* NOTREACHED */ -} - -/* * Special device advisory byte-level locks. */ /* ARGSUSED */ diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index 9358834..e1c9a87 100644 --- a/sys/miscfs/union/union_vnops.c +++ b/sys/miscfs/union/union_vnops.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $Id: union_vnops.c,v 1.43 1997/10/15 09:21:32 phk Exp $ + * $Id: union_vnops.c,v 1.44 1997/10/15 10:04:54 phk Exp $ */ #include <sys/param.h> @@ -94,7 +94,6 @@ static int union_remove __P((struct vop_remove_args *ap)); static int union_rename __P((struct vop_rename_args *ap)); static int union_revoke __P((struct vop_revoke_args *ap)); static int union_rmdir __P((struct vop_rmdir_args *ap)); -static int union_seek __P((struct vop_seek_args *ap)); static int union_poll __P((struct vop_poll_args *ap)); static int union_setattr __P((struct vop_setattr_args *ap)); static int union_strategy __P((struct vop_strategy_args *ap)); @@ -1035,21 +1034,6 @@ union_fsync(ap) } static int -union_seek(ap) - struct vop_seek_args /* { - struct vnode *a_vp; - off_t a_oldoff; - off_t a_newoff; - struct ucred *a_cred; - } */ *ap; -{ - register struct vnode *ovp = OTHERVP(ap->a_vp); - - ap->a_vp = ovp; - return (VCALL(ovp, VOFFSET(vop_seek), ap)); -} - -static int union_remove(ap) struct vop_remove_args /* { struct vnode *a_dvp; @@ -1786,7 +1770,6 @@ static struct vnodeopv_entry_desc union_vnodeop_entries[] = { { &vop_rename_desc, (vop_t *) union_rename }, { &vop_revoke_desc, (vop_t *) union_revoke }, { &vop_rmdir_desc, (vop_t *) union_rmdir }, - { &vop_seek_desc, (vop_t *) union_seek }, { &vop_setattr_desc, (vop_t *) union_setattr }, { &vop_strategy_desc, (vop_t *) union_strategy }, { &vop_symlink_desc, (vop_t *) union_symlink }, |
