diff options
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/cd9660/cd9660_vnops.c | 103 | ||||
| -rw-r--r-- | sys/fs/deadfs/dead_vnops.c | 8 | ||||
| -rw-r--r-- | sys/fs/fdescfs/fdesc_vnops.c | 45 | ||||
| -rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 37 | ||||
| -rw-r--r-- | sys/fs/msdosfs/msdosfs_vnops.c | 123 | ||||
| -rw-r--r-- | sys/fs/portalfs/portal_vnops.c | 44 | ||||
| -rw-r--r-- | sys/fs/procfs/procfs_vnops.c | 65 | ||||
| -rw-r--r-- | sys/fs/specfs/spec_vnops.c | 47 | ||||
| -rw-r--r-- | sys/fs/unionfs/union_vnops.c | 19 |
9 files changed, 16 insertions, 475 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index b794436..0318324 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vnops.c 8.19 (Berkeley) 5/27/95 - * $Id: cd9660_vnops.c,v 1.43 1997/10/15 13:22:39 phk Exp $ + * $Id: cd9660_vnops.c,v 1.44 1997/10/16 10:47:47 phk Exp $ */ #include <sys/param.h> @@ -59,14 +59,9 @@ #include <isofs/cd9660/iso_rrip.h> static int cd9660_setattr __P((struct vop_setattr_args *)); -static int cd9660_open __P((struct vop_open_args *)); -static int cd9660_close __P((struct vop_close_args *)); static int cd9660_access __P((struct vop_access_args *)); static int cd9660_getattr __P((struct vop_getattr_args *)); static int cd9660_read __P((struct vop_read_args *)); -static int cd9660_ioctl __P((struct vop_ioctl_args *)); -static int cd9660_mmap __P((struct vop_mmap_args *)); -static int cd9660_seek __P((struct vop_seek_args *)); struct isoreaddir; static int iso_uiodir __P((struct isoreaddir *idp, struct dirent *dp, off_t off)); @@ -118,42 +113,6 @@ cd9660_setattr(ap) } /* - * Open called. - * - * Nothing to do. - */ -/* ARGSUSED */ -static int -cd9660_open(ap) - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - return (0); -} - -/* - * Close called - * - * Update the times on the inode on writeable file systems. - */ -/* ARGSUSED */ -static int -cd9660_close(ap) - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - return (0); -} - -/* * Check mode permission on inode pointer. Mode is READ, WRITE or EXEC. * The mode is shifted to select the owner/group/other fields. The * super user is granted all permissions. @@ -357,60 +316,6 @@ cd9660_read(ap) return (error); } -/* ARGSUSED */ -static int -cd9660_ioctl(ap) - struct vop_ioctl_args /* { - struct vnode *a_vp; - u_long a_command; - caddr_t a_data; - int a_fflag; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - printf("You did ioctl for isofs !!\n"); - return (ENOTTY); -} - -/* - * Mmap a file - * - * NB Currently unsupported. - */ -/* ARGSUSED */ -static int -cd9660_mmap(ap) - struct vop_mmap_args /* { - struct vnode *a_vp; - int a_fflags; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - - return (EINVAL); -} - -/* - * Seek on a file - * - * Nothing to do, so just return. - */ -/* ARGSUSED */ -static int -cd9660_seek(ap) - struct vop_seek_args /* { - struct vnode *a_vp; - off_t a_oldoff; - off_t a_newoff; - struct ucred *a_cred; - } */ *ap; -{ - - return (0); -} - /* * Structure for reading directories */ @@ -962,23 +867,17 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = { { &vop_access_desc, (vop_t *) cd9660_access }, { &vop_bmap_desc, (vop_t *) cd9660_bmap }, { &vop_cachedlookup_desc, (vop_t *) cd9660_lookup }, - { &vop_close_desc, (vop_t *) cd9660_close }, - { &vop_fsync_desc, (vop_t *) nullop }, { &vop_getattr_desc, (vop_t *) cd9660_getattr }, { &vop_inactive_desc, (vop_t *) cd9660_inactive }, - { &vop_ioctl_desc, (vop_t *) cd9660_ioctl }, { &vop_islocked_desc, (vop_t *) cd9660_islocked }, { &vop_lock_desc, (vop_t *) cd9660_lock }, { &vop_lookup_desc, (vop_t *) vfs_cache_lookup }, - { &vop_mmap_desc, (vop_t *) cd9660_mmap }, - { &vop_open_desc, (vop_t *) cd9660_open }, { &vop_pathconf_desc, (vop_t *) cd9660_pathconf }, { &vop_print_desc, (vop_t *) cd9660_print }, { &vop_read_desc, (vop_t *) cd9660_read }, { &vop_readdir_desc, (vop_t *) cd9660_readdir }, { &vop_readlink_desc, (vop_t *) cd9660_readlink }, { &vop_reclaim_desc, (vop_t *) cd9660_reclaim }, - { &vop_seek_desc, (vop_t *) cd9660_seek }, { &vop_setattr_desc, (vop_t *) cd9660_setattr }, { &vop_strategy_desc, (vop_t *) cd9660_strategy }, { &vop_unlock_desc, (vop_t *) cd9660_unlock }, diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index 3c41130..051977f 100644 --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/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/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 7793177..ccc5e5b 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.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/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 0b157a54..8c46042 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/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/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 6871b10..5adce6f 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vnops.c,v 1.47 1997/10/15 10:05:03 phk Exp $ */ +/* $Id: msdosfs_vnops.c,v 1.48 1997/10/16 10:48:52 phk Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */ /*- @@ -79,18 +79,13 @@ */ static int msdosfs_create __P((struct vop_create_args *)); static int msdosfs_mknod __P((struct vop_mknod_args *)); -static int msdosfs_open __P((struct vop_open_args *)); static int msdosfs_close __P((struct vop_close_args *)); static int msdosfs_access __P((struct vop_access_args *)); static int msdosfs_getattr __P((struct vop_getattr_args *)); static int msdosfs_setattr __P((struct vop_setattr_args *)); static int msdosfs_read __P((struct vop_read_args *)); static int msdosfs_write __P((struct vop_write_args *)); -static int msdosfs_ioctl __P((struct vop_ioctl_args *)); -static int msdosfs_poll __P((struct vop_poll_args *)); -static int msdosfs_mmap __P((struct vop_mmap_args *)); static int msdosfs_fsync __P((struct vop_fsync_args *)); -static int msdosfs_seek __P((struct vop_seek_args *)); static int msdosfs_remove __P((struct vop_remove_args *)); static int msdosfs_link __P((struct vop_link_args *)); static int msdosfs_rename __P((struct vop_rename_args *)); @@ -98,7 +93,6 @@ static int msdosfs_mkdir __P((struct vop_mkdir_args *)); static int msdosfs_rmdir __P((struct vop_rmdir_args *)); static int msdosfs_symlink __P((struct vop_symlink_args *)); static int msdosfs_readdir __P((struct vop_readdir_args *)); -static int msdosfs_readlink __P((struct vop_readlink_args *)); static int msdosfs_abortop __P((struct vop_abortop_args *)); static int msdosfs_lock __P((struct vop_lock_args *)); static int msdosfs_unlock __P((struct vop_unlock_args *)); @@ -106,9 +100,7 @@ static int msdosfs_bmap __P((struct vop_bmap_args *)); static int msdosfs_strategy __P((struct vop_strategy_args *)); static int msdosfs_print __P((struct vop_print_args *)); static int msdosfs_islocked __P((struct vop_islocked_args *)); -static int msdosfs_advlock __P((struct vop_advlock_args *)); static int msdosfs_pathconf __P((struct vop_pathconf_args *ap)); -static int msdosfs_reallocblks __P((struct vop_reallocblks_args *)); /* * Some general notes: @@ -215,18 +207,6 @@ msdosfs_mknod(ap) } static int -msdosfs_open(ap) - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - return 0; -} - -static int msdosfs_close(ap) struct vop_close_args /* { struct vnode *a_vp; @@ -826,45 +806,6 @@ errexit: return error; } -static int -msdosfs_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; -} - -static int -msdosfs_poll(ap) - struct vop_poll_args /* { - struct vnode *a_vp; - int a_events; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - /* DOS filesystems never block? */ - return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); -} - -static int -msdosfs_mmap(ap) - struct vop_mmap_args /* { - struct vnode *a_vp; - int a_fflags; - struct ucred *a_cred; - struct proc *a_p; - } */ *ap; -{ - return EINVAL; -} - /* * Flush the blocks of a file to disk. * @@ -919,22 +860,6 @@ loop: return deupdat(VTODE(vp), &ts, wait); } -/* - * Now the whole work of extending a file is done in the write function. - * So nothing to do here. - */ -static int -msdosfs_seek(ap) - struct vop_seek_args /* { - struct vnode *a_vp; - off_t a_oldoff; - off_t a_newoff; - struct ucred *a_cred; - } */ *ap; -{ - return 0; -} - static int msdosfs_remove(ap) struct vop_remove_args /* { @@ -1772,20 +1697,6 @@ out: ; return error; } -/* - * DOS filesystems don't know what symlinks are. - */ -static int -msdosfs_readlink(ap) - struct vop_readlink_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - } */ *ap; -{ - return EINVAL; -} - static int msdosfs_abortop(ap) struct vop_abortop_args /* { @@ -1873,17 +1784,6 @@ msdosfs_bmap(ap) } static int -msdosfs_reallocblks(ap) - struct vop_reallocblks_args /* { - struct vnode *a_vp; - struct cluster_save *a_buflist; - } */ *ap; -{ - /* Currently no support for clustering */ /* XXX */ - return ENOSPC; -} - -static int msdosfs_strategy(ap) struct vop_strategy_args /* { struct buf *a_bp; @@ -1943,19 +1843,6 @@ msdosfs_print(ap) } static int -msdosfs_advlock(ap) - struct vop_advlock_args /* { - struct vnode *a_vp; - caddr_t a_id; - int a_op; - struct flock *a_fl; - int a_flags; - } */ *ap; -{ - return EINVAL; /* we don't do locking yet */ -} - -static int msdosfs_pathconf(ap) struct vop_pathconf_args /* { struct vnode *a_vp; @@ -1990,7 +1877,6 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = { { &vop_default_desc, (vop_t *) vn_default_error }, { &vop_abortop_desc, (vop_t *) msdosfs_abortop }, { &vop_access_desc, (vop_t *) msdosfs_access }, - { &vop_advlock_desc, (vop_t *) msdosfs_advlock }, { &vop_bmap_desc, (vop_t *) msdosfs_bmap }, { &vop_cachedlookup_desc, (vop_t *) msdosfs_lookup }, { &vop_close_desc, (vop_t *) msdosfs_close }, @@ -1998,27 +1884,20 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = { { &vop_fsync_desc, (vop_t *) msdosfs_fsync }, { &vop_getattr_desc, (vop_t *) msdosfs_getattr }, { &vop_inactive_desc, (vop_t *) msdosfs_inactive }, - { &vop_ioctl_desc, (vop_t *) msdosfs_ioctl }, { &vop_islocked_desc, (vop_t *) msdosfs_islocked }, { &vop_link_desc, (vop_t *) msdosfs_link }, { &vop_lock_desc, (vop_t *) msdosfs_lock }, { &vop_lookup_desc, (vop_t *) vfs_cache_lookup }, { &vop_mkdir_desc, (vop_t *) msdosfs_mkdir }, { &vop_mknod_desc, (vop_t *) msdosfs_mknod }, - { &vop_mmap_desc, (vop_t *) msdosfs_mmap }, - { &vop_open_desc, (vop_t *) msdosfs_open }, { &vop_pathconf_desc, (vop_t *) msdosfs_pathconf }, - { &vop_poll_desc, (vop_t *) msdosfs_poll }, { &vop_print_desc, (vop_t *) msdosfs_print }, { &vop_read_desc, (vop_t *) msdosfs_read }, { &vop_readdir_desc, (vop_t *) msdosfs_readdir }, - { &vop_readlink_desc, (vop_t *) msdosfs_readlink }, - { &vop_reallocblks_desc, (vop_t *) msdosfs_reallocblks }, { &vop_reclaim_desc, (vop_t *) msdosfs_reclaim }, { &vop_remove_desc, (vop_t *) msdosfs_remove }, { &vop_rename_desc, (vop_t *) msdosfs_rename }, { &vop_rmdir_desc, (vop_t *) msdosfs_rmdir }, - { &vop_seek_desc, (vop_t *) msdosfs_seek }, { &vop_setattr_desc, (vop_t *) msdosfs_setattr }, { &vop_strategy_desc, (vop_t *) msdosfs_strategy }, { &vop_symlink_desc, (vop_t *) msdosfs_symlink }, diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index d8c2230..df35f0c 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/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/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c index ab62a4d..8caf5fe 100644 --- a/sys/fs/procfs/procfs_vnops.c +++ b/sys/fs/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/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index 12a9f29..bdf769b 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.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/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 9358834..e1c9a87 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/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 }, |
