diff options
31 files changed, 1910 insertions, 2129 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index cddb6fd..74d68b8 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.39 1997/09/21 04:22:40 dyson Exp $ + * $Id: cd9660_vnops.c,v 1.40 1997/09/27 13:38:51 kato Exp $ */ #include <sys/param.h> @@ -995,55 +995,50 @@ cd9660_pathconf(ap) */ vop_t **cd9660_vnodeop_p; struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = { - - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)vfs_cache_lookup }, /* lookup */ - { &vop_cachedlookup_desc, (vop_t *)cd9660_lookup }, /* lookup */ - { &vop_create_desc, (vop_t *)cd9660_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)cd9660_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)cd9660_open }, /* open */ - { &vop_close_desc, (vop_t *)cd9660_close }, /* close */ - { &vop_access_desc, (vop_t *)cd9660_access }, /* access */ - { &vop_getattr_desc, (vop_t *)cd9660_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)cd9660_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)cd9660_read }, /* read */ - { &vop_write_desc, (vop_t *)cd9660_write }, /* write */ - { &vop_lease_desc, (vop_t *)cd9660_lease_check },/* lease */ - { &vop_ioctl_desc, (vop_t *)cd9660_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)cd9660_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)cd9660_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)cd9660_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)cd9660_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)cd9660_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)cd9660_remove }, /* remove */ - { &vop_link_desc, (vop_t *)cd9660_link }, /* link */ - { &vop_rename_desc, (vop_t *)cd9660_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)cd9660_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)cd9660_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)cd9660_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)cd9660_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)cd9660_readlink },/* readlink */ - { &vop_abortop_desc, (vop_t *)cd9660_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)cd9660_inactive },/* inactive */ - { &vop_reclaim_desc, (vop_t *)cd9660_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)cd9660_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)cd9660_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)cd9660_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)cd9660_strategy },/* strategy */ - { &vop_print_desc, (vop_t *)cd9660_print }, /* print */ - { &vop_islocked_desc, (vop_t *)cd9660_islocked },/* islocked */ - { &vop_pathconf_desc, (vop_t *)cd9660_pathconf },/* pathconf */ - { &vop_advlock_desc, (vop_t *)cd9660_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)cd9660_blkatoff },/* blkatoff */ - { &vop_valloc_desc, (vop_t *)cd9660_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)cd9660_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)cd9660_truncate },/* truncate */ - { &vop_update_desc, (vop_t *)cd9660_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) cd9660_abortop }, + { &vop_access_desc, (vop_t *) cd9660_access }, + { &vop_advlock_desc, (vop_t *) cd9660_advlock }, + { &vop_blkatoff_desc, (vop_t *) cd9660_blkatoff }, + { &vop_bmap_desc, (vop_t *) cd9660_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_cachedlookup_desc, (vop_t *) cd9660_lookup }, + { &vop_close_desc, (vop_t *) cd9660_close }, + { &vop_create_desc, (vop_t *) cd9660_create }, + { &vop_fsync_desc, (vop_t *) cd9660_fsync }, + { &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_lease_desc, (vop_t *) cd9660_lease_check }, + { &vop_link_desc, (vop_t *) cd9660_link }, + { &vop_lock_desc, (vop_t *) cd9660_lock }, + { &vop_lookup_desc, (vop_t *) vfs_cache_lookup }, + { &vop_mkdir_desc, (vop_t *) cd9660_mkdir }, + { &vop_mknod_desc, (vop_t *) cd9660_mknod }, + { &vop_mmap_desc, (vop_t *) cd9660_mmap }, + { &vop_open_desc, (vop_t *) cd9660_open }, + { &vop_pathconf_desc, (vop_t *) cd9660_pathconf }, + { &vop_poll_desc, (vop_t *) cd9660_poll }, + { &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_remove_desc, (vop_t *) cd9660_remove }, + { &vop_rename_desc, (vop_t *) cd9660_rename }, + { &vop_revoke_desc, (vop_t *) cd9660_revoke }, + { &vop_rmdir_desc, (vop_t *) cd9660_rmdir }, + { &vop_seek_desc, (vop_t *) cd9660_seek }, + { &vop_setattr_desc, (vop_t *) cd9660_setattr }, + { &vop_strategy_desc, (vop_t *) cd9660_strategy }, + { &vop_symlink_desc, (vop_t *) cd9660_symlink }, + { &vop_truncate_desc, (vop_t *) cd9660_truncate }, + { &vop_unlock_desc, (vop_t *) cd9660_unlock }, + { &vop_update_desc, (vop_t *) cd9660_update }, + { &vop_valloc_desc, (vop_t *) cd9660_valloc }, + { &vop_vfree_desc, (vop_t *) cd9660_vfree }, + { &vop_write_desc, (vop_t *) cd9660_write }, { NULL, NULL } }; static struct vnodeopv_desc cd9660_vnodeop_opv_desc = @@ -1055,54 +1050,49 @@ VNODEOP_SET(cd9660_vnodeop_opv_desc); */ vop_t **cd9660_specop_p; struct vnodeopv_entry_desc cd9660_specop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)spec_close }, /* close */ - { &vop_access_desc, (vop_t *)cd9660_access }, /* access */ - { &vop_getattr_desc, (vop_t *)cd9660_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)cd9660_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)spec_read }, /* read */ - { &vop_write_desc, (vop_t *)spec_write }, /* write */ - { &vop_lease_desc, (vop_t *)spec_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)spec_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)spec_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)cd9660_inactive },/* inactive */ - { &vop_reclaim_desc, (vop_t *)cd9660_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)cd9660_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)cd9660_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)cd9660_print }, /* print */ - { &vop_islocked_desc, (vop_t *)cd9660_islocked },/* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)spec_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)spec_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)cd9660_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) cd9660_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_blkatoff_desc, (vop_t *) spec_blkatoff }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) spec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) spec_fsync }, + { &vop_getattr_desc, (vop_t *) cd9660_getattr }, + { &vop_inactive_desc, (vop_t *) cd9660_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) cd9660_islocked }, + { &vop_lease_desc, (vop_t *) spec_lease_check }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) cd9660_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) cd9660_print }, + { &vop_read_desc, (vop_t *) spec_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reclaim_desc, (vop_t *) cd9660_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_revoke_desc, (vop_t *) spec_revoke }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) cd9660_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) spec_symlink }, + { &vop_truncate_desc, (vop_t *) spec_truncate }, + { &vop_unlock_desc, (vop_t *) cd9660_unlock }, + { &vop_update_desc, (vop_t *) cd9660_update }, + { &vop_valloc_desc, (vop_t *) spec_valloc }, + { &vop_vfree_desc, (vop_t *) spec_vfree }, + { &vop_write_desc, (vop_t *) spec_write }, { NULL, NULL } }; static struct vnodeopv_desc cd9660_specop_opv_desc = @@ -1111,54 +1101,49 @@ VNODEOP_SET(cd9660_specop_opv_desc); vop_t **cd9660_fifoop_p; struct vnodeopv_entry_desc cd9660_fifoop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fifo_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fifo_open }, /* open */ - { &vop_close_desc, (vop_t *)fifo_close }, /* close */ - { &vop_access_desc, (vop_t *)cd9660_access }, /* access */ - { &vop_getattr_desc, (vop_t *)cd9660_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)cd9660_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)fifo_read }, /* read */ - { &vop_write_desc, (vop_t *)fifo_write }, /* write */ - { &vop_lease_desc, (vop_t *)fifo_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)fifo_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)fifo_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fifo_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fifo_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fifo_link } , /* link */ - { &vop_rename_desc, (vop_t *)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)cd9660_inactive },/* inactive */ - { &vop_reclaim_desc, (vop_t *)cd9660_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)cd9660_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)cd9660_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fifo_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)cd9660_print }, /* print */ - { &vop_islocked_desc, (vop_t *)cd9660_islocked },/* islocked */ - { &vop_pathconf_desc, (vop_t *)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)fifo_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)fifo_valloc }, /* valloc */ -/* XXX: vop_reallocpages */ - { &vop_vfree_desc, (vop_t *)fifo_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)fifo_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)cd9660_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fifo_abortop }, + { &vop_access_desc, (vop_t *) cd9660_access }, + { &vop_advlock_desc, (vop_t *) fifo_advlock }, + { &vop_blkatoff_desc, (vop_t *) fifo_blkatoff }, + { &vop_bmap_desc, (vop_t *) fifo_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) fifo_close }, + { &vop_create_desc, (vop_t *) fifo_create }, + { &vop_fsync_desc, (vop_t *) fifo_fsync }, + { &vop_getattr_desc, (vop_t *) cd9660_getattr }, + { &vop_inactive_desc, (vop_t *) cd9660_inactive }, + { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, + { &vop_islocked_desc, (vop_t *) cd9660_islocked }, + { &vop_lease_desc, (vop_t *) fifo_lease_check }, + { &vop_link_desc, (vop_t *) fifo_link }, + { &vop_lock_desc, (vop_t *) cd9660_lock }, + { &vop_lookup_desc, (vop_t *) fifo_lookup }, + { &vop_mkdir_desc, (vop_t *) fifo_mkdir }, + { &vop_mknod_desc, (vop_t *) fifo_mknod }, + { &vop_mmap_desc, (vop_t *) fifo_mmap }, + { &vop_open_desc, (vop_t *) fifo_open }, + { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_poll_desc, (vop_t *) fifo_poll }, + { &vop_print_desc, (vop_t *) cd9660_print }, + { &vop_read_desc, (vop_t *) fifo_read }, + { &vop_readdir_desc, (vop_t *) fifo_readdir }, + { &vop_readlink_desc, (vop_t *) fifo_readlink }, + { &vop_reclaim_desc, (vop_t *) cd9660_reclaim }, + { &vop_remove_desc, (vop_t *) fifo_remove }, + { &vop_rename_desc, (vop_t *) fifo_rename }, + { &vop_revoke_desc, (vop_t *) fifo_revoke }, + { &vop_rmdir_desc, (vop_t *) fifo_rmdir }, + { &vop_seek_desc, (vop_t *) fifo_seek }, + { &vop_setattr_desc, (vop_t *) cd9660_setattr }, + { &vop_strategy_desc, (vop_t *) fifo_strategy }, + { &vop_symlink_desc, (vop_t *) fifo_symlink }, + { &vop_truncate_desc, (vop_t *) fifo_truncate }, + { &vop_unlock_desc, (vop_t *) cd9660_unlock }, + { &vop_update_desc, (vop_t *) cd9660_update }, + { &vop_valloc_desc, (vop_t *) fifo_valloc }, + { &vop_vfree_desc, (vop_t *) fifo_vfree }, + { &vop_write_desc, (vop_t *) fifo_write }, { NULL, NULL } }; static struct vnodeopv_desc cd9660_fifoop_opv_desc = diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index a8856f9..d4bb0ae 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.14 1997/09/02 20:06:08 bde Exp $ + * $Id: dead_vnops.c,v 1.15 1997/09/14 02:57:46 peter Exp $ */ #include <sys/param.h> @@ -89,54 +89,47 @@ static int dead_print __P((struct vop_print_args *)); vop_t **dead_vnodeop_p; static struct vnodeopv_entry_desc dead_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)dead_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)dead_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)dead_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)dead_open }, /* open */ - { &vop_close_desc, (vop_t *)dead_close }, /* close */ - { &vop_access_desc, (vop_t *)dead_access }, /* access */ - { &vop_getattr_desc, (vop_t *)dead_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)dead_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)dead_read }, /* read */ - { &vop_write_desc, (vop_t *)dead_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)dead_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)dead_poll }, /* poll */ -/* XXX: vop_revoke */ - { &vop_mmap_desc, (vop_t *)dead_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)dead_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)dead_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)dead_remove }, /* remove */ - { &vop_link_desc, (vop_t *)dead_link }, /* link */ - { &vop_rename_desc, (vop_t *)dead_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)dead_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)dead_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)dead_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)dead_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)dead_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)dead_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)dead_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)dead_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)dead_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)dead_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)dead_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)dead_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)dead_print }, /* print */ - { &vop_islocked_desc, (vop_t *)dead_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)dead_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)dead_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)dead_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)dead_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)dead_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)dead_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)dead_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)dead_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) dead_abortop }, + { &vop_access_desc, (vop_t *) dead_access }, + { &vop_advlock_desc, (vop_t *) dead_advlock }, + { &vop_blkatoff_desc, (vop_t *) dead_blkatoff }, + { &vop_bmap_desc, (vop_t *) dead_bmap }, + { &vop_bwrite_desc, (vop_t *) dead_bwrite }, + { &vop_close_desc, (vop_t *) dead_close }, + { &vop_create_desc, (vop_t *) dead_create }, + { &vop_fsync_desc, (vop_t *) dead_fsync }, + { &vop_getattr_desc, (vop_t *) dead_getattr }, + { &vop_inactive_desc, (vop_t *) dead_inactive }, + { &vop_ioctl_desc, (vop_t *) dead_ioctl }, + { &vop_islocked_desc, (vop_t *) dead_islocked }, + { &vop_link_desc, (vop_t *) dead_link }, + { &vop_lock_desc, (vop_t *) dead_lock }, + { &vop_lookup_desc, (vop_t *) dead_lookup }, + { &vop_mkdir_desc, (vop_t *) dead_mkdir }, + { &vop_mknod_desc, (vop_t *) dead_mknod }, + { &vop_mmap_desc, (vop_t *) dead_mmap }, + { &vop_open_desc, (vop_t *) dead_open }, + { &vop_pathconf_desc, (vop_t *) dead_pathconf }, + { &vop_poll_desc, (vop_t *) dead_poll }, + { &vop_print_desc, (vop_t *) dead_print }, + { &vop_read_desc, (vop_t *) dead_read }, + { &vop_readdir_desc, (vop_t *) dead_readdir }, + { &vop_readlink_desc, (vop_t *) dead_readlink }, + { &vop_reclaim_desc, (vop_t *) dead_reclaim }, + { &vop_remove_desc, (vop_t *) dead_remove }, + { &vop_rename_desc, (vop_t *) dead_rename }, + { &vop_rmdir_desc, (vop_t *) dead_rmdir }, + { &vop_seek_desc, (vop_t *) dead_seek }, + { &vop_setattr_desc, (vop_t *) dead_setattr }, + { &vop_strategy_desc, (vop_t *) dead_strategy }, + { &vop_symlink_desc, (vop_t *) dead_symlink }, + { &vop_truncate_desc, (vop_t *) dead_truncate }, + { &vop_unlock_desc, (vop_t *) dead_unlock }, + { &vop_update_desc, (vop_t *) dead_update }, + { &vop_valloc_desc, (vop_t *) dead_valloc }, + { &vop_vfree_desc, (vop_t *) dead_vfree }, + { &vop_write_desc, (vop_t *) dead_write }, { NULL, NULL } }; static struct vnodeopv_desc dead_vnodeop_opv_desc = diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index f63bd1b..dca208e 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.25 1997/09/07 05:25:53 bde Exp $ + * $Id: fdesc_vnops.c,v 1.26 1997/09/14 02:57:50 peter Exp $ */ /* @@ -942,54 +942,48 @@ fdesc_badop() #define fdesc_bwrite ((int (*) __P((struct vop_bwrite_args *)))eopnotsupp) static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fdesc_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fdesc_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)fdesc_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fdesc_open }, /* open */ - { &vop_close_desc, (vop_t *)fdesc_close }, /* close */ - { &vop_access_desc, (vop_t *)fdesc_access }, /* access */ - { &vop_getattr_desc, (vop_t *)fdesc_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)fdesc_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)fdesc_read }, /* read */ -/* XXX: vop_lease */ - { &vop_write_desc, (vop_t *)fdesc_write }, /* write */ - { &vop_ioctl_desc, (vop_t *)fdesc_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fdesc_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)fdesc_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)fdesc_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)fdesc_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fdesc_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fdesc_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fdesc_link }, /* link */ - { &vop_rename_desc, (vop_t *)fdesc_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fdesc_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fdesc_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fdesc_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fdesc_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fdesc_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fdesc_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)fdesc_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)fdesc_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)fdesc_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)fdesc_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fdesc_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fdesc_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)fdesc_print }, /* print */ - { &vop_islocked_desc, (vop_t *)fdesc_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)fdesc_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fdesc_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)fdesc_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)fdesc_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)fdesc_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)fdesc_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)fdesc_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)fdesc_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fdesc_abortop }, + { &vop_access_desc, (vop_t *) fdesc_access }, + { &vop_advlock_desc, (vop_t *) fdesc_advlock }, + { &vop_blkatoff_desc, (vop_t *) fdesc_blkatoff }, + { &vop_bmap_desc, (vop_t *) fdesc_bmap }, + { &vop_bwrite_desc, (vop_t *) fdesc_bwrite }, + { &vop_close_desc, (vop_t *) fdesc_close }, + { &vop_create_desc, (vop_t *) fdesc_create }, + { &vop_fsync_desc, (vop_t *) fdesc_fsync }, + { &vop_getattr_desc, (vop_t *) fdesc_getattr }, + { &vop_inactive_desc, (vop_t *) fdesc_inactive }, + { &vop_ioctl_desc, (vop_t *) fdesc_ioctl }, + { &vop_islocked_desc, (vop_t *) fdesc_islocked }, + { &vop_link_desc, (vop_t *) fdesc_link }, + { &vop_lock_desc, (vop_t *) fdesc_lock }, + { &vop_lookup_desc, (vop_t *) fdesc_lookup }, + { &vop_mkdir_desc, (vop_t *) fdesc_mkdir }, + { &vop_mknod_desc, (vop_t *) fdesc_mknod }, + { &vop_mmap_desc, (vop_t *) fdesc_mmap }, + { &vop_open_desc, (vop_t *) fdesc_open }, + { &vop_pathconf_desc, (vop_t *) fdesc_pathconf }, + { &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_remove_desc, (vop_t *) fdesc_remove }, + { &vop_rename_desc, (vop_t *) fdesc_rename }, + { &vop_revoke_desc, (vop_t *) fdesc_revoke }, + { &vop_rmdir_desc, (vop_t *) fdesc_rmdir }, + { &vop_seek_desc, (vop_t *) fdesc_seek }, + { &vop_setattr_desc, (vop_t *) fdesc_setattr }, + { &vop_strategy_desc, (vop_t *) fdesc_strategy }, + { &vop_symlink_desc, (vop_t *) fdesc_symlink }, + { &vop_truncate_desc, (vop_t *) fdesc_truncate }, + { &vop_unlock_desc, (vop_t *) fdesc_unlock }, + { &vop_update_desc, (vop_t *) fdesc_update }, + { &vop_valloc_desc, (vop_t *) fdesc_valloc }, + { &vop_vfree_desc, (vop_t *) fdesc_vfree }, + { &vop_write_desc, (vop_t *) fdesc_write }, { NULL, NULL } }; static struct vnodeopv_desc fdesc_vnodeop_opv_desc = diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 27553a9..1cb11d7 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.27 1997/09/14 02:57:53 peter Exp $ + * $Id: fifo_vnops.c,v 1.28 1997/10/12 20:24:42 phk Exp $ */ #include <sys/param.h> @@ -65,50 +65,49 @@ static int fifo_print __P((struct vop_print_args *)); vop_t **fifo_vnodeop_p; static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fifo_create }, /* create */ - { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fifo_open }, /* open */ - { &vop_close_desc, (vop_t *)fifo_close }, /* close */ - { &vop_access_desc, (vop_t *)fifo_access }, /* access */ - { &vop_getattr_desc, (vop_t *)fifo_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)fifo_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)fifo_read }, /* read */ - { &vop_write_desc, (vop_t *)fifo_write }, /* write */ - { &vop_lease_desc, (vop_t *)fifo_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)fifo_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)fifo_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fifo_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fifo_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fifo_link }, /* link */ - { &vop_rename_desc, (vop_t *)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)fifo_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)fifo_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)fifo_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)fifo_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fifo_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)fifo_print }, /* print */ - { &vop_islocked_desc, (vop_t *)fifo_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)fifo_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)fifo_valloc }, /* valloc */ - { &vop_vfree_desc, (vop_t *)fifo_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)fifo_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)fifo_update }, /* update */ - { &vop_bwrite_desc, (vop_t *)fifo_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fifo_abortop }, + { &vop_access_desc, (vop_t *) fifo_access }, + { &vop_advlock_desc, (vop_t *) fifo_advlock }, + { &vop_blkatoff_desc, (vop_t *) fifo_blkatoff }, + { &vop_bmap_desc, (vop_t *) fifo_bmap }, + { &vop_bwrite_desc, (vop_t *) fifo_bwrite }, + { &vop_close_desc, (vop_t *) fifo_close }, + { &vop_create_desc, (vop_t *) fifo_create }, + { &vop_fsync_desc, (vop_t *) fifo_fsync }, + { &vop_getattr_desc, (vop_t *) fifo_getattr }, + { &vop_inactive_desc, (vop_t *) fifo_inactive }, + { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, + { &vop_islocked_desc, (vop_t *) fifo_islocked }, + { &vop_lease_desc, (vop_t *) fifo_lease_check }, + { &vop_link_desc, (vop_t *) fifo_link }, + { &vop_lock_desc, (vop_t *) fifo_lock }, + { &vop_lookup_desc, (vop_t *) fifo_lookup }, + { &vop_mkdir_desc, (vop_t *) fifo_mkdir }, + { &vop_mknod_desc, (vop_t *) fifo_mknod }, + { &vop_mmap_desc, (vop_t *) fifo_mmap }, + { &vop_open_desc, (vop_t *) fifo_open }, + { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_poll_desc, (vop_t *) fifo_poll }, + { &vop_print_desc, (vop_t *) fifo_print }, + { &vop_read_desc, (vop_t *) fifo_read }, + { &vop_readdir_desc, (vop_t *) fifo_readdir }, + { &vop_readlink_desc, (vop_t *) fifo_readlink }, + { &vop_reclaim_desc, (vop_t *) fifo_reclaim }, + { &vop_remove_desc, (vop_t *) fifo_remove }, + { &vop_rename_desc, (vop_t *) fifo_rename }, + { &vop_revoke_desc, (vop_t *) fifo_revoke }, + { &vop_rmdir_desc, (vop_t *) fifo_rmdir }, + { &vop_seek_desc, (vop_t *) fifo_seek }, + { &vop_setattr_desc, (vop_t *) fifo_setattr }, + { &vop_strategy_desc, (vop_t *) fifo_strategy }, + { &vop_symlink_desc, (vop_t *) fifo_symlink }, + { &vop_truncate_desc, (vop_t *) fifo_truncate }, + { &vop_unlock_desc, (vop_t *) fifo_unlock }, + { &vop_update_desc, (vop_t *) fifo_update }, + { &vop_valloc_desc, (vop_t *) fifo_valloc }, + { &vop_vfree_desc, (vop_t *) fifo_vfree }, + { &vop_write_desc, (vop_t *) fifo_write }, { NULL, NULL } }; static struct vnodeopv_desc fifo_vnodeop_opv_desc = diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 8d9bfc5..5938775 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.44 1997/09/14 02:57:44 peter Exp $ */ +/* $Id: msdosfs_vnops.c,v 1.45 1997/09/21 04:23:39 dyson Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */ /*- @@ -1987,54 +1987,44 @@ msdosfs_pathconf(ap) /* Global vfs data structures for msdosfs */ vop_t **msdosfs_vnodeop_p; static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)vfs_cache_lookup }, /* lookup */ - { &vop_cachedlookup_desc, (vop_t *)msdosfs_lookup }, /* lookup */ - { &vop_create_desc, (vop_t *)msdosfs_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)msdosfs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)msdosfs_open }, /* open */ - { &vop_close_desc, (vop_t *)msdosfs_close }, /* close */ - { &vop_access_desc, (vop_t *)msdosfs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)msdosfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)msdosfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)msdosfs_read }, /* read */ - { &vop_write_desc, (vop_t *)msdosfs_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)msdosfs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)msdosfs_poll }, /* poll */ -/* XXX: vop_revoke */ - { &vop_mmap_desc, (vop_t *)msdosfs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)msdosfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)msdosfs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)msdosfs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)msdosfs_link }, /* link */ - { &vop_rename_desc, (vop_t *)msdosfs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)msdosfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)msdosfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)msdosfs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)msdosfs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)msdosfs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)msdosfs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)msdosfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)msdosfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)msdosfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)msdosfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)msdosfs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)msdosfs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)msdosfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)msdosfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)msdosfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)msdosfs_advlock }, /* advlock */ -/* XXX: vop_blkatoff */ -/* XXX: vop_valloc */ - { &vop_reallocblks_desc, (vop_t *)msdosfs_reallocblks }, /* reallocblks */ -/* XXX: vop_vfree */ -/* XXX: vop_truncate */ -/* XXX: vop_update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &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_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_cachedlookup_desc, (vop_t *) msdosfs_lookup }, + { &vop_close_desc, (vop_t *) msdosfs_close }, + { &vop_create_desc, (vop_t *) msdosfs_create }, + { &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 }, + { &vop_unlock_desc, (vop_t *) msdosfs_unlock }, + { &vop_write_desc, (vop_t *) msdosfs_write }, { NULL, NULL } }; static struct vnodeopv_desc msdosfs_vnodeop_opv_desc = diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index 9db6725..f9f7226 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -37,11 +37,11 @@ * * Ancestors: * @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92 - * $Id: null_vnops.c,v 1.21 1997/08/02 14:32:05 bde Exp $ + * $Id: null_vnops.c,v 1.22 1997/09/18 18:33:18 phk Exp $ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $Id: null_vnops.c,v 1.21 1997/08/02 14:32:05 bde Exp $ + * $Id: null_vnops.c,v 1.22 1997/09/18 18:33:18 phk Exp $ */ /* @@ -639,21 +639,18 @@ null_bwrite(ap) */ vop_t **null_vnodeop_p; static struct vnodeopv_entry_desc null_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)null_bypass }, - - { &vop_lookup_desc, (vop_t *)null_lookup }, - { &vop_setattr_desc, (vop_t *)null_setattr }, - { &vop_getattr_desc, (vop_t *)null_getattr }, - { &vop_access_desc, (vop_t *)null_access }, - { &vop_lock_desc, (vop_t *)null_lock }, - { &vop_unlock_desc, (vop_t *)null_unlock }, - { &vop_inactive_desc, (vop_t *)null_inactive }, - { &vop_reclaim_desc, (vop_t *)null_reclaim }, - { &vop_print_desc, (vop_t *)null_print }, - - { &vop_strategy_desc, (vop_t *)null_strategy }, - { &vop_bwrite_desc, (vop_t *)null_bwrite }, - + { &vop_default_desc, (vop_t *) null_bypass }, + { &vop_access_desc, (vop_t *) null_access }, + { &vop_bwrite_desc, (vop_t *) null_bwrite }, + { &vop_getattr_desc, (vop_t *) null_getattr }, + { &vop_inactive_desc, (vop_t *) null_inactive }, + { &vop_lock_desc, (vop_t *) null_lock }, + { &vop_lookup_desc, (vop_t *) null_lookup }, + { &vop_print_desc, (vop_t *) null_print }, + { &vop_reclaim_desc, (vop_t *) null_reclaim }, + { &vop_setattr_desc, (vop_t *) null_setattr }, + { &vop_strategy_desc, (vop_t *) null_strategy }, + { &vop_unlock_desc, (vop_t *) null_unlock }, { NULL, NULL } }; static struct vnodeopv_desc null_vnodeop_opv_desc = diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index a8b05cd..75a2101 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.20 1997/08/16 19:15:18 wollman Exp $ + * $Id: portal_vnops.c,v 1.21 1997/09/14 02:57:57 peter Exp $ */ /* @@ -693,54 +693,48 @@ portal_badop() vop_t **portal_vnodeop_p; static struct vnodeopv_entry_desc portal_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)portal_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)portal_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)portal_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)portal_open }, /* open */ - { &vop_close_desc, (vop_t *)portal_close }, /* close */ - { &vop_access_desc, (vop_t *)portal_access }, /* access */ - { &vop_getattr_desc, (vop_t *)portal_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)portal_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)portal_read }, /* read */ - { &vop_write_desc, (vop_t *)portal_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)portal_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)portal_poll }, /* poll */ - { &vop_mmap_desc, (vop_t *)portal_mmap }, /* mmap */ - { &vop_revoke_desc, (vop_t *)portal_revoke }, /* revoke */ - { &vop_fsync_desc, (vop_t *)portal_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)portal_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)portal_remove }, /* remove */ - { &vop_link_desc, (vop_t *)portal_link }, /* link */ - { &vop_rename_desc, (vop_t *)portal_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)portal_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)portal_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)portal_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)portal_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)portal_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)portal_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)portal_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)portal_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)portal_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)portal_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)portal_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)portal_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)portal_print }, /* print */ - { &vop_islocked_desc, (vop_t *)portal_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)portal_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)portal_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)portal_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)portal_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)portal_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)portal_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)portal_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)portal_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) portal_abortop }, + { &vop_access_desc, (vop_t *) portal_access }, + { &vop_advlock_desc, (vop_t *) portal_advlock }, + { &vop_blkatoff_desc, (vop_t *) portal_blkatoff }, + { &vop_bmap_desc, (vop_t *) portal_bmap }, + { &vop_bwrite_desc, (vop_t *) portal_bwrite }, + { &vop_close_desc, (vop_t *) portal_close }, + { &vop_create_desc, (vop_t *) portal_create }, + { &vop_fsync_desc, (vop_t *) portal_fsync }, + { &vop_getattr_desc, (vop_t *) portal_getattr }, + { &vop_inactive_desc, (vop_t *) portal_inactive }, + { &vop_ioctl_desc, (vop_t *) portal_ioctl }, + { &vop_islocked_desc, (vop_t *) portal_islocked }, + { &vop_link_desc, (vop_t *) portal_link }, + { &vop_lock_desc, (vop_t *) portal_lock }, + { &vop_lookup_desc, (vop_t *) portal_lookup }, + { &vop_mkdir_desc, (vop_t *) portal_mkdir }, + { &vop_mknod_desc, (vop_t *) portal_mknod }, + { &vop_mmap_desc, (vop_t *) portal_mmap }, + { &vop_open_desc, (vop_t *) portal_open }, + { &vop_pathconf_desc, (vop_t *) portal_pathconf }, + { &vop_poll_desc, (vop_t *) portal_poll }, + { &vop_print_desc, (vop_t *) portal_print }, + { &vop_read_desc, (vop_t *) portal_read }, + { &vop_readdir_desc, (vop_t *) portal_readdir }, + { &vop_readlink_desc, (vop_t *) portal_readlink }, + { &vop_reclaim_desc, (vop_t *) portal_reclaim }, + { &vop_remove_desc, (vop_t *) portal_remove }, + { &vop_rename_desc, (vop_t *) portal_rename }, + { &vop_revoke_desc, (vop_t *) portal_revoke }, + { &vop_rmdir_desc, (vop_t *) portal_rmdir }, + { &vop_seek_desc, (vop_t *) portal_seek }, + { &vop_setattr_desc, (vop_t *) portal_setattr }, + { &vop_strategy_desc, (vop_t *) portal_strategy }, + { &vop_symlink_desc, (vop_t *) portal_symlink }, + { &vop_truncate_desc, (vop_t *) portal_truncate }, + { &vop_unlock_desc, (vop_t *) portal_unlock }, + { &vop_update_desc, (vop_t *) portal_update }, + { &vop_valloc_desc, (vop_t *) portal_valloc }, + { &vop_vfree_desc, (vop_t *) portal_vfree }, + { &vop_write_desc, (vop_t *) portal_write }, { NULL, NULL } }; static struct vnodeopv_desc portal_vnodeop_opv_desc = diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c index 7912c95..0d989c4 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.32 1997/09/14 02:57:58 peter Exp $ + * $Id: procfs_vnops.c,v 1.33 1997/09/21 04:23:23 dyson Exp $ */ /* @@ -968,54 +968,47 @@ atopid(b, len) */ vop_t **procfs_vnodeop_p; static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)procfs_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)procfs_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)procfs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)procfs_open }, /* open */ - { &vop_close_desc, (vop_t *)procfs_close }, /* close */ - { &vop_access_desc, (vop_t *)procfs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)procfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)procfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)procfs_read }, /* read */ - { &vop_write_desc, (vop_t *)procfs_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)procfs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)procfs_poll }, /* poll */ - { &vop_mmap_desc, (vop_t *)procfs_mmap }, /* mmap */ - { &vop_revoke_desc, (vop_t *)procfs_revoke }, /* revoke */ - { &vop_fsync_desc, (vop_t *)procfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)procfs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)procfs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)procfs_link }, /* link */ - { &vop_rename_desc, (vop_t *)procfs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)procfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)procfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)procfs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)procfs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)procfs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)procfs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)procfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)procfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)procfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)procfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)procfs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)procfs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)procfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)procfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)procfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)procfs_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)procfs_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)procfs_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)procfs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)procfs_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)procfs_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ -/* XXX: vop_bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) procfs_abortop }, + { &vop_access_desc, (vop_t *) procfs_access }, + { &vop_advlock_desc, (vop_t *) procfs_advlock }, + { &vop_blkatoff_desc, (vop_t *) procfs_blkatoff }, + { &vop_bmap_desc, (vop_t *) procfs_bmap }, + { &vop_close_desc, (vop_t *) procfs_close }, + { &vop_create_desc, (vop_t *) procfs_create }, + { &vop_fsync_desc, (vop_t *) procfs_fsync }, + { &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 *) procfs_islocked }, + { &vop_link_desc, (vop_t *) procfs_link }, + { &vop_lock_desc, (vop_t *) procfs_lock }, + { &vop_lookup_desc, (vop_t *) procfs_lookup }, + { &vop_mkdir_desc, (vop_t *) procfs_mkdir }, + { &vop_mknod_desc, (vop_t *) procfs_mknod }, + { &vop_mmap_desc, (vop_t *) procfs_mmap }, + { &vop_open_desc, (vop_t *) procfs_open }, + { &vop_pathconf_desc, (vop_t *) procfs_pathconf }, + { &vop_poll_desc, (vop_t *) procfs_poll }, + { &vop_print_desc, (vop_t *) procfs_print }, + { &vop_read_desc, (vop_t *) procfs_read }, + { &vop_readdir_desc, (vop_t *) procfs_readdir }, + { &vop_readlink_desc, (vop_t *) procfs_readlink }, + { &vop_reclaim_desc, (vop_t *) procfs_reclaim }, + { &vop_remove_desc, (vop_t *) procfs_remove }, + { &vop_rename_desc, (vop_t *) procfs_rename }, + { &vop_revoke_desc, (vop_t *) procfs_revoke }, + { &vop_rmdir_desc, (vop_t *) procfs_rmdir }, + { &vop_seek_desc, (vop_t *) procfs_seek }, + { &vop_setattr_desc, (vop_t *) procfs_setattr }, + { &vop_strategy_desc, (vop_t *) procfs_strategy }, + { &vop_symlink_desc, (vop_t *) procfs_symlink }, + { &vop_truncate_desc, (vop_t *) procfs_truncate }, + { &vop_unlock_desc, (vop_t *) procfs_unlock }, + { &vop_update_desc, (vop_t *) procfs_update }, + { &vop_valloc_desc, (vop_t *) procfs_valloc }, + { &vop_vfree_desc, (vop_t *) procfs_vfree }, + { &vop_write_desc, (vop_t *) procfs_write }, { NULL, NULL } }; static struct vnodeopv_desc procfs_vnodeop_opv_desc = diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index dd05fc0..d798e81 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.42 1997/09/14 02:58:02 peter Exp $ + * $Id: spec_vnops.c,v 1.43 1997/09/27 13:39:20 kato Exp $ */ #include <sys/param.h> @@ -64,54 +64,50 @@ static int spec_getattr __P((struct vop_getattr_args *)); struct vnode *speclisth[SPECHSZ]; vop_t **spec_vnodeop_p; static struct vnodeopv_entry_desc spec_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)spec_close }, /* close */ - { &vop_access_desc, (vop_t *)spec_access }, /* access */ - { &vop_getattr_desc, (vop_t *)spec_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)spec_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)spec_read }, /* read */ - { &vop_write_desc, (vop_t *)spec_write }, /* write */ - { &vop_lease_desc, (vop_t *)spec_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)spec_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)spec_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)spec_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)spec_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)spec_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)spec_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)spec_print }, /* print */ - { &vop_islocked_desc, (vop_t *)spec_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)spec_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)spec_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)spec_update }, /* update */ - { &vop_getpages_desc, (vop_t *)spec_getpages}, /* getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) spec_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_blkatoff_desc, (vop_t *) spec_blkatoff }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) spec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) spec_fsync }, + { &vop_getattr_desc, (vop_t *) spec_getattr }, + { &vop_getpages_desc, (vop_t *) spec_getpages }, + { &vop_inactive_desc, (vop_t *) spec_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) spec_islocked }, + { &vop_lease_desc, (vop_t *) spec_lease_check }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) spec_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) spec_print }, + { &vop_read_desc, (vop_t *) spec_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reclaim_desc, (vop_t *) spec_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_revoke_desc, (vop_t *) spec_revoke }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) spec_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) spec_symlink }, + { &vop_truncate_desc, (vop_t *) spec_truncate }, + { &vop_unlock_desc, (vop_t *) spec_unlock }, + { &vop_update_desc, (vop_t *) spec_update }, + { &vop_valloc_desc, (vop_t *) spec_valloc }, + { &vop_vfree_desc, (vop_t *) spec_vfree }, + { &vop_write_desc, (vop_t *) spec_write }, { NULL, NULL } }; static struct vnodeopv_desc spec_vnodeop_opv_desc = diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c index 64d5fba..dc6d9d9 100644 --- a/sys/fs/umapfs/umap_vnops.c +++ b/sys/fs/umapfs/umap_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95 - * $Id: umap_vnops.c,v 1.18 1997/08/02 14:32:26 bde Exp $ + * $Id: umap_vnops.c,v 1.19 1997/09/18 18:33:23 phk Exp $ */ /* @@ -529,19 +529,16 @@ umap_rename(ap) */ vop_t **umap_vnodeop_p; static struct vnodeopv_entry_desc umap_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)umap_bypass }, - - { &vop_getattr_desc, (vop_t *)umap_getattr }, - { &vop_lock_desc, (vop_t *)umap_lock }, - { &vop_unlock_desc, (vop_t *)umap_unlock }, - { &vop_inactive_desc, (vop_t *)umap_inactive }, - { &vop_reclaim_desc, (vop_t *)umap_reclaim }, - { &vop_print_desc, (vop_t *)umap_print }, - { &vop_rename_desc, (vop_t *)umap_rename }, - - { &vop_strategy_desc, (vop_t *)umap_strategy }, - { &vop_bwrite_desc, (vop_t *)umap_bwrite }, - + { &vop_default_desc, (vop_t *) umap_bypass }, + { &vop_bwrite_desc, (vop_t *) umap_bwrite }, + { &vop_getattr_desc, (vop_t *) umap_getattr }, + { &vop_inactive_desc, (vop_t *) umap_inactive }, + { &vop_lock_desc, (vop_t *) umap_lock }, + { &vop_print_desc, (vop_t *) umap_print }, + { &vop_reclaim_desc, (vop_t *) umap_reclaim }, + { &vop_rename_desc, (vop_t *) umap_rename }, + { &vop_strategy_desc, (vop_t *) umap_strategy }, + { &vop_unlock_desc, (vop_t *) umap_unlock }, { NULL, NULL } }; static struct vnodeopv_desc umap_vnodeop_opv_desc = diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 469ae53..f4573bf 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.41 1997/09/07 06:46:34 bde Exp $ + * $Id: union_vnops.c,v 1.42 1997/09/14 02:58:04 peter Exp $ */ #include <sys/param.h> @@ -1755,56 +1755,44 @@ union_strategy(ap) */ vop_t **union_vnodeop_p; static struct vnodeopv_entry_desc union_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)union_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)union_create }, /* create */ - { &vop_whiteout_desc, (vop_t *)union_whiteout }, /* whiteout */ - { &vop_mknod_desc, (vop_t *)union_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)union_open }, /* open */ - { &vop_close_desc, (vop_t *)union_close }, /* close */ - { &vop_access_desc, (vop_t *)union_access }, /* access */ - { &vop_getattr_desc, (vop_t *)union_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)union_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)union_read }, /* read */ - { &vop_write_desc, (vop_t *)union_write }, /* write */ - { &vop_lease_desc, (vop_t *)union_lease }, /* lease */ - { &vop_ioctl_desc, (vop_t *)union_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)union_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)union_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)union_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)union_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)union_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)union_remove }, /* remove */ - { &vop_link_desc, (vop_t *)union_link }, /* link */ - { &vop_rename_desc, (vop_t *)union_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)union_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)union_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)union_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)union_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)union_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)union_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)union_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)union_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)union_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)union_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)union_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)union_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)union_print }, /* print */ - { &vop_islocked_desc, (vop_t *)union_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)union_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)union_advlock }, /* advlock */ -#ifdef notdef - { &vop_blkatoff_desc, (vop_t *)union_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)union_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)union_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)union_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)union_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)union_bwrite }, /* bwrite */ -#endif + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) union_abortop }, + { &vop_access_desc, (vop_t *) union_access }, + { &vop_advlock_desc, (vop_t *) union_advlock }, + { &vop_bmap_desc, (vop_t *) union_bmap }, + { &vop_close_desc, (vop_t *) union_close }, + { &vop_create_desc, (vop_t *) union_create }, + { &vop_fsync_desc, (vop_t *) union_fsync }, + { &vop_getattr_desc, (vop_t *) union_getattr }, + { &vop_inactive_desc, (vop_t *) union_inactive }, + { &vop_ioctl_desc, (vop_t *) union_ioctl }, + { &vop_islocked_desc, (vop_t *) union_islocked }, + { &vop_lease_desc, (vop_t *) union_lease }, + { &vop_link_desc, (vop_t *) union_link }, + { &vop_lock_desc, (vop_t *) union_lock }, + { &vop_lookup_desc, (vop_t *) union_lookup }, + { &vop_mkdir_desc, (vop_t *) union_mkdir }, + { &vop_mknod_desc, (vop_t *) union_mknod }, + { &vop_mmap_desc, (vop_t *) union_mmap }, + { &vop_open_desc, (vop_t *) union_open }, + { &vop_pathconf_desc, (vop_t *) union_pathconf }, + { &vop_poll_desc, (vop_t *) union_poll }, + { &vop_print_desc, (vop_t *) union_print }, + { &vop_read_desc, (vop_t *) union_read }, + { &vop_readdir_desc, (vop_t *) union_readdir }, + { &vop_readlink_desc, (vop_t *) union_readlink }, + { &vop_reclaim_desc, (vop_t *) union_reclaim }, + { &vop_remove_desc, (vop_t *) union_remove }, + { &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 }, + { &vop_unlock_desc, (vop_t *) union_unlock }, + { &vop_whiteout_desc, (vop_t *) union_whiteout }, + { &vop_write_desc, (vop_t *) union_write }, { NULL, NULL } }; static struct vnodeopv_desc union_vnodeop_opv_desc = diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c index aa05894..9ed6238 100644 --- a/sys/gnu/ext2fs/ext2_vnops.c +++ b/sys/gnu/ext2fs/ext2_vnops.c @@ -83,49 +83,49 @@ static int ext2_write __P((struct vop_write_args *)); /* Global vfs data structures for ufs. */ vop_t **ext2_vnodeop_p; static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)vfs_cache_lookup }, /* lookup */ - { &vop_cachedlookup_desc, (vop_t *)ext2_lookup }, /* lookup */ - { &vop_create_desc, (vop_t *)ufs_create }, /* create */ - { &vop_mknod_desc, (vop_t *)ufs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)ufs_open }, /* open */ - { &vop_close_desc, (vop_t *)ufs_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ext2_read }, /* read */ - { &vop_write_desc, (vop_t *)ext2_write }, /* write */ - { &vop_ioctl_desc, (vop_t *)ufs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)ufs_poll }, /* poll */ - { &vop_mmap_desc, (vop_t *)ufs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)ext2_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)ufs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)ufs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)ufs_link }, /* link */ - { &vop_rename_desc, (vop_t *)ufs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)ufs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)ufs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)ufs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)ext2_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)ufs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)ufs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ext2_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)ufs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)ufs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)ufs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)ufs_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)ext2_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)ext2_valloc }, /* valloc */ - { &vop_reallocblks_desc, (vop_t *)ext2_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (vop_t *)ext2_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)ext2_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)ext2_update }, /* update */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) ufs_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) ufs_advlock }, + { &vop_blkatoff_desc, (vop_t *) ext2_blkatoff }, + { &vop_bmap_desc, (vop_t *) ufs_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_cachedlookup_desc, (vop_t *) ext2_lookup }, + { &vop_close_desc, (vop_t *) ufs_close }, + { &vop_create_desc, (vop_t *) ufs_create }, + { &vop_fsync_desc, (vop_t *) ext2_fsync }, + { &vop_getattr_desc, (vop_t *) ufs_getattr }, + { &vop_inactive_desc, (vop_t *) ext2_inactive }, + { &vop_ioctl_desc, (vop_t *) ufs_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_link_desc, (vop_t *) ufs_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) vfs_cache_lookup }, + { &vop_mkdir_desc, (vop_t *) ufs_mkdir }, + { &vop_mknod_desc, (vop_t *) ufs_mknod }, + { &vop_mmap_desc, (vop_t *) ufs_mmap }, + { &vop_open_desc, (vop_t *) ufs_open }, + { &vop_pathconf_desc, (vop_t *) ufs_pathconf }, + { &vop_poll_desc, (vop_t *) ufs_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ext2_read }, + { &vop_readdir_desc, (vop_t *) ext2_readdir }, + { &vop_readlink_desc, (vop_t *) ufs_readlink }, + { &vop_reallocblks_desc, (vop_t *) ext2_reallocblks }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) ufs_remove }, + { &vop_rename_desc, (vop_t *) ufs_rename }, + { &vop_rmdir_desc, (vop_t *) ufs_rmdir }, + { &vop_seek_desc, (vop_t *) ufs_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) ufs_strategy }, + { &vop_symlink_desc, (vop_t *) ufs_symlink }, + { &vop_truncate_desc, (vop_t *) ext2_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) ext2_update }, + { &vop_valloc_desc, (vop_t *) ext2_valloc }, + { &vop_vfree_desc, (vop_t *) ext2_vfree }, + { &vop_write_desc, (vop_t *) ext2_write }, { NULL, NULL } }; static struct vnodeopv_desc ext2fs_vnodeop_opv_desc = @@ -133,49 +133,48 @@ static struct vnodeopv_desc ext2fs_vnodeop_opv_desc = vop_t **ext2_specop_p; static struct vnodeopv_entry_desc ext2_specop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)ufsspec_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ufsspec_read }, /* read */ - { &vop_write_desc, (vop_t *)ufsspec_write }, /* write */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)ext2_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ext2_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)spec_valloc }, /* valloc */ - { &vop_reallocblks_desc, (vop_t *)spec_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (vop_t *)ext2_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)ext2_update }, /* update */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_blkatoff_desc, (vop_t *) spec_blkatoff }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) ufsspec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) ext2_fsync }, + { &vop_getattr_desc, (vop_t *) ufs_getattr }, + { &vop_inactive_desc, (vop_t *) ext2_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ufsspec_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reallocblks_desc, (vop_t *) spec_reallocblks }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) spec_symlink }, + { &vop_truncate_desc, (vop_t *) spec_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) ext2_update }, + { &vop_valloc_desc, (vop_t *) spec_valloc }, + { &vop_vfree_desc, (vop_t *) ext2_vfree }, + { &vop_write_desc, (vop_t *) ufsspec_write }, { NULL, NULL } }; static struct vnodeopv_desc ext2fs_specop_opv_desc = @@ -183,49 +182,48 @@ static struct vnodeopv_desc ext2fs_specop_opv_desc = vop_t **ext2_fifoop_p; static struct vnodeopv_entry_desc ext2_fifoop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fifo_create }, /* create */ - { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fifo_open }, /* open */ - { &vop_close_desc, (vop_t *)ufsfifo_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ufsfifo_read }, /* read */ - { &vop_write_desc, (vop_t *)ufsfifo_write }, /* write */ - { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ - { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)ext2_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fifo_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fifo_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fifo_link }, /* link */ - { &vop_rename_desc, (vop_t *)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ext2_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fifo_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)fifo_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)fifo_valloc }, /* valloc */ - { &vop_reallocblks_desc, (vop_t *)fifo_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (vop_t *)ext2_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)fifo_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)ext2_update }, /* update */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fifo_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) fifo_advlock }, + { &vop_blkatoff_desc, (vop_t *) fifo_blkatoff }, + { &vop_bmap_desc, (vop_t *) fifo_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) ufsfifo_close }, + { &vop_create_desc, (vop_t *) fifo_create }, + { &vop_fsync_desc, (vop_t *) ext2_fsync }, + { &vop_getattr_desc, (vop_t *) ufs_getattr }, + { &vop_inactive_desc, (vop_t *) ext2_inactive }, + { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_link_desc, (vop_t *) fifo_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) fifo_lookup }, + { &vop_mkdir_desc, (vop_t *) fifo_mkdir }, + { &vop_mknod_desc, (vop_t *) fifo_mknod }, + { &vop_mmap_desc, (vop_t *) fifo_mmap }, + { &vop_open_desc, (vop_t *) fifo_open }, + { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_poll_desc, (vop_t *) fifo_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ufsfifo_read }, + { &vop_readdir_desc, (vop_t *) fifo_readdir }, + { &vop_readlink_desc, (vop_t *) fifo_readlink }, + { &vop_reallocblks_desc, (vop_t *) fifo_reallocblks }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) fifo_remove }, + { &vop_rename_desc, (vop_t *) fifo_rename }, + { &vop_rmdir_desc, (vop_t *) fifo_rmdir }, + { &vop_seek_desc, (vop_t *) fifo_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) fifo_strategy }, + { &vop_symlink_desc, (vop_t *) fifo_symlink }, + { &vop_truncate_desc, (vop_t *) fifo_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) ext2_update }, + { &vop_valloc_desc, (vop_t *) fifo_valloc }, + { &vop_vfree_desc, (vop_t *) ext2_vfree }, + { &vop_write_desc, (vop_t *) ufsfifo_write }, { NULL, NULL } }; static struct vnodeopv_desc ext2fs_fifoop_opv_desc = diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c index aa05894..9ed6238 100644 --- a/sys/gnu/fs/ext2fs/ext2_vnops.c +++ b/sys/gnu/fs/ext2fs/ext2_vnops.c @@ -83,49 +83,49 @@ static int ext2_write __P((struct vop_write_args *)); /* Global vfs data structures for ufs. */ vop_t **ext2_vnodeop_p; static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)vfs_cache_lookup }, /* lookup */ - { &vop_cachedlookup_desc, (vop_t *)ext2_lookup }, /* lookup */ - { &vop_create_desc, (vop_t *)ufs_create }, /* create */ - { &vop_mknod_desc, (vop_t *)ufs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)ufs_open }, /* open */ - { &vop_close_desc, (vop_t *)ufs_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ext2_read }, /* read */ - { &vop_write_desc, (vop_t *)ext2_write }, /* write */ - { &vop_ioctl_desc, (vop_t *)ufs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)ufs_poll }, /* poll */ - { &vop_mmap_desc, (vop_t *)ufs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)ext2_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)ufs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)ufs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)ufs_link }, /* link */ - { &vop_rename_desc, (vop_t *)ufs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)ufs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)ufs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)ufs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)ext2_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)ufs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)ufs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ext2_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)ufs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)ufs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)ufs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)ufs_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)ext2_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)ext2_valloc }, /* valloc */ - { &vop_reallocblks_desc, (vop_t *)ext2_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (vop_t *)ext2_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)ext2_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)ext2_update }, /* update */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) ufs_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) ufs_advlock }, + { &vop_blkatoff_desc, (vop_t *) ext2_blkatoff }, + { &vop_bmap_desc, (vop_t *) ufs_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_cachedlookup_desc, (vop_t *) ext2_lookup }, + { &vop_close_desc, (vop_t *) ufs_close }, + { &vop_create_desc, (vop_t *) ufs_create }, + { &vop_fsync_desc, (vop_t *) ext2_fsync }, + { &vop_getattr_desc, (vop_t *) ufs_getattr }, + { &vop_inactive_desc, (vop_t *) ext2_inactive }, + { &vop_ioctl_desc, (vop_t *) ufs_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_link_desc, (vop_t *) ufs_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) vfs_cache_lookup }, + { &vop_mkdir_desc, (vop_t *) ufs_mkdir }, + { &vop_mknod_desc, (vop_t *) ufs_mknod }, + { &vop_mmap_desc, (vop_t *) ufs_mmap }, + { &vop_open_desc, (vop_t *) ufs_open }, + { &vop_pathconf_desc, (vop_t *) ufs_pathconf }, + { &vop_poll_desc, (vop_t *) ufs_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ext2_read }, + { &vop_readdir_desc, (vop_t *) ext2_readdir }, + { &vop_readlink_desc, (vop_t *) ufs_readlink }, + { &vop_reallocblks_desc, (vop_t *) ext2_reallocblks }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) ufs_remove }, + { &vop_rename_desc, (vop_t *) ufs_rename }, + { &vop_rmdir_desc, (vop_t *) ufs_rmdir }, + { &vop_seek_desc, (vop_t *) ufs_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) ufs_strategy }, + { &vop_symlink_desc, (vop_t *) ufs_symlink }, + { &vop_truncate_desc, (vop_t *) ext2_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) ext2_update }, + { &vop_valloc_desc, (vop_t *) ext2_valloc }, + { &vop_vfree_desc, (vop_t *) ext2_vfree }, + { &vop_write_desc, (vop_t *) ext2_write }, { NULL, NULL } }; static struct vnodeopv_desc ext2fs_vnodeop_opv_desc = @@ -133,49 +133,48 @@ static struct vnodeopv_desc ext2fs_vnodeop_opv_desc = vop_t **ext2_specop_p; static struct vnodeopv_entry_desc ext2_specop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)ufsspec_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ufsspec_read }, /* read */ - { &vop_write_desc, (vop_t *)ufsspec_write }, /* write */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)ext2_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ext2_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)spec_valloc }, /* valloc */ - { &vop_reallocblks_desc, (vop_t *)spec_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (vop_t *)ext2_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)ext2_update }, /* update */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_blkatoff_desc, (vop_t *) spec_blkatoff }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) ufsspec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) ext2_fsync }, + { &vop_getattr_desc, (vop_t *) ufs_getattr }, + { &vop_inactive_desc, (vop_t *) ext2_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ufsspec_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reallocblks_desc, (vop_t *) spec_reallocblks }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) spec_symlink }, + { &vop_truncate_desc, (vop_t *) spec_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) ext2_update }, + { &vop_valloc_desc, (vop_t *) spec_valloc }, + { &vop_vfree_desc, (vop_t *) ext2_vfree }, + { &vop_write_desc, (vop_t *) ufsspec_write }, { NULL, NULL } }; static struct vnodeopv_desc ext2fs_specop_opv_desc = @@ -183,49 +182,48 @@ static struct vnodeopv_desc ext2fs_specop_opv_desc = vop_t **ext2_fifoop_p; static struct vnodeopv_entry_desc ext2_fifoop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fifo_create }, /* create */ - { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fifo_open }, /* open */ - { &vop_close_desc, (vop_t *)ufsfifo_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ufsfifo_read }, /* read */ - { &vop_write_desc, (vop_t *)ufsfifo_write }, /* write */ - { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ - { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)ext2_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fifo_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fifo_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fifo_link }, /* link */ - { &vop_rename_desc, (vop_t *)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ext2_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fifo_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)fifo_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)fifo_valloc }, /* valloc */ - { &vop_reallocblks_desc, (vop_t *)fifo_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (vop_t *)ext2_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)fifo_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)ext2_update }, /* update */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fifo_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) fifo_advlock }, + { &vop_blkatoff_desc, (vop_t *) fifo_blkatoff }, + { &vop_bmap_desc, (vop_t *) fifo_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) ufsfifo_close }, + { &vop_create_desc, (vop_t *) fifo_create }, + { &vop_fsync_desc, (vop_t *) ext2_fsync }, + { &vop_getattr_desc, (vop_t *) ufs_getattr }, + { &vop_inactive_desc, (vop_t *) ext2_inactive }, + { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_link_desc, (vop_t *) fifo_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) fifo_lookup }, + { &vop_mkdir_desc, (vop_t *) fifo_mkdir }, + { &vop_mknod_desc, (vop_t *) fifo_mknod }, + { &vop_mmap_desc, (vop_t *) fifo_mmap }, + { &vop_open_desc, (vop_t *) fifo_open }, + { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_poll_desc, (vop_t *) fifo_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ufsfifo_read }, + { &vop_readdir_desc, (vop_t *) fifo_readdir }, + { &vop_readlink_desc, (vop_t *) fifo_readlink }, + { &vop_reallocblks_desc, (vop_t *) fifo_reallocblks }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) fifo_remove }, + { &vop_rename_desc, (vop_t *) fifo_rename }, + { &vop_rmdir_desc, (vop_t *) fifo_rmdir }, + { &vop_seek_desc, (vop_t *) fifo_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) fifo_strategy }, + { &vop_symlink_desc, (vop_t *) fifo_symlink }, + { &vop_truncate_desc, (vop_t *) fifo_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) ext2_update }, + { &vop_valloc_desc, (vop_t *) fifo_valloc }, + { &vop_vfree_desc, (vop_t *) ext2_vfree }, + { &vop_write_desc, (vop_t *) ufsfifo_write }, { NULL, NULL } }; static struct vnodeopv_desc ext2fs_fifoop_opv_desc = diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index cddb6fd..74d68b8 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/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.39 1997/09/21 04:22:40 dyson Exp $ + * $Id: cd9660_vnops.c,v 1.40 1997/09/27 13:38:51 kato Exp $ */ #include <sys/param.h> @@ -995,55 +995,50 @@ cd9660_pathconf(ap) */ vop_t **cd9660_vnodeop_p; struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = { - - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)vfs_cache_lookup }, /* lookup */ - { &vop_cachedlookup_desc, (vop_t *)cd9660_lookup }, /* lookup */ - { &vop_create_desc, (vop_t *)cd9660_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)cd9660_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)cd9660_open }, /* open */ - { &vop_close_desc, (vop_t *)cd9660_close }, /* close */ - { &vop_access_desc, (vop_t *)cd9660_access }, /* access */ - { &vop_getattr_desc, (vop_t *)cd9660_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)cd9660_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)cd9660_read }, /* read */ - { &vop_write_desc, (vop_t *)cd9660_write }, /* write */ - { &vop_lease_desc, (vop_t *)cd9660_lease_check },/* lease */ - { &vop_ioctl_desc, (vop_t *)cd9660_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)cd9660_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)cd9660_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)cd9660_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)cd9660_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)cd9660_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)cd9660_remove }, /* remove */ - { &vop_link_desc, (vop_t *)cd9660_link }, /* link */ - { &vop_rename_desc, (vop_t *)cd9660_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)cd9660_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)cd9660_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)cd9660_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)cd9660_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)cd9660_readlink },/* readlink */ - { &vop_abortop_desc, (vop_t *)cd9660_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)cd9660_inactive },/* inactive */ - { &vop_reclaim_desc, (vop_t *)cd9660_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)cd9660_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)cd9660_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)cd9660_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)cd9660_strategy },/* strategy */ - { &vop_print_desc, (vop_t *)cd9660_print }, /* print */ - { &vop_islocked_desc, (vop_t *)cd9660_islocked },/* islocked */ - { &vop_pathconf_desc, (vop_t *)cd9660_pathconf },/* pathconf */ - { &vop_advlock_desc, (vop_t *)cd9660_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)cd9660_blkatoff },/* blkatoff */ - { &vop_valloc_desc, (vop_t *)cd9660_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)cd9660_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)cd9660_truncate },/* truncate */ - { &vop_update_desc, (vop_t *)cd9660_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) cd9660_abortop }, + { &vop_access_desc, (vop_t *) cd9660_access }, + { &vop_advlock_desc, (vop_t *) cd9660_advlock }, + { &vop_blkatoff_desc, (vop_t *) cd9660_blkatoff }, + { &vop_bmap_desc, (vop_t *) cd9660_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_cachedlookup_desc, (vop_t *) cd9660_lookup }, + { &vop_close_desc, (vop_t *) cd9660_close }, + { &vop_create_desc, (vop_t *) cd9660_create }, + { &vop_fsync_desc, (vop_t *) cd9660_fsync }, + { &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_lease_desc, (vop_t *) cd9660_lease_check }, + { &vop_link_desc, (vop_t *) cd9660_link }, + { &vop_lock_desc, (vop_t *) cd9660_lock }, + { &vop_lookup_desc, (vop_t *) vfs_cache_lookup }, + { &vop_mkdir_desc, (vop_t *) cd9660_mkdir }, + { &vop_mknod_desc, (vop_t *) cd9660_mknod }, + { &vop_mmap_desc, (vop_t *) cd9660_mmap }, + { &vop_open_desc, (vop_t *) cd9660_open }, + { &vop_pathconf_desc, (vop_t *) cd9660_pathconf }, + { &vop_poll_desc, (vop_t *) cd9660_poll }, + { &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_remove_desc, (vop_t *) cd9660_remove }, + { &vop_rename_desc, (vop_t *) cd9660_rename }, + { &vop_revoke_desc, (vop_t *) cd9660_revoke }, + { &vop_rmdir_desc, (vop_t *) cd9660_rmdir }, + { &vop_seek_desc, (vop_t *) cd9660_seek }, + { &vop_setattr_desc, (vop_t *) cd9660_setattr }, + { &vop_strategy_desc, (vop_t *) cd9660_strategy }, + { &vop_symlink_desc, (vop_t *) cd9660_symlink }, + { &vop_truncate_desc, (vop_t *) cd9660_truncate }, + { &vop_unlock_desc, (vop_t *) cd9660_unlock }, + { &vop_update_desc, (vop_t *) cd9660_update }, + { &vop_valloc_desc, (vop_t *) cd9660_valloc }, + { &vop_vfree_desc, (vop_t *) cd9660_vfree }, + { &vop_write_desc, (vop_t *) cd9660_write }, { NULL, NULL } }; static struct vnodeopv_desc cd9660_vnodeop_opv_desc = @@ -1055,54 +1050,49 @@ VNODEOP_SET(cd9660_vnodeop_opv_desc); */ vop_t **cd9660_specop_p; struct vnodeopv_entry_desc cd9660_specop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)spec_close }, /* close */ - { &vop_access_desc, (vop_t *)cd9660_access }, /* access */ - { &vop_getattr_desc, (vop_t *)cd9660_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)cd9660_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)spec_read }, /* read */ - { &vop_write_desc, (vop_t *)spec_write }, /* write */ - { &vop_lease_desc, (vop_t *)spec_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)spec_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)spec_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)cd9660_inactive },/* inactive */ - { &vop_reclaim_desc, (vop_t *)cd9660_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)cd9660_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)cd9660_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)cd9660_print }, /* print */ - { &vop_islocked_desc, (vop_t *)cd9660_islocked },/* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)spec_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)spec_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)cd9660_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) cd9660_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_blkatoff_desc, (vop_t *) spec_blkatoff }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) spec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) spec_fsync }, + { &vop_getattr_desc, (vop_t *) cd9660_getattr }, + { &vop_inactive_desc, (vop_t *) cd9660_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) cd9660_islocked }, + { &vop_lease_desc, (vop_t *) spec_lease_check }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) cd9660_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) cd9660_print }, + { &vop_read_desc, (vop_t *) spec_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reclaim_desc, (vop_t *) cd9660_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_revoke_desc, (vop_t *) spec_revoke }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) cd9660_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) spec_symlink }, + { &vop_truncate_desc, (vop_t *) spec_truncate }, + { &vop_unlock_desc, (vop_t *) cd9660_unlock }, + { &vop_update_desc, (vop_t *) cd9660_update }, + { &vop_valloc_desc, (vop_t *) spec_valloc }, + { &vop_vfree_desc, (vop_t *) spec_vfree }, + { &vop_write_desc, (vop_t *) spec_write }, { NULL, NULL } }; static struct vnodeopv_desc cd9660_specop_opv_desc = @@ -1111,54 +1101,49 @@ VNODEOP_SET(cd9660_specop_opv_desc); vop_t **cd9660_fifoop_p; struct vnodeopv_entry_desc cd9660_fifoop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fifo_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fifo_open }, /* open */ - { &vop_close_desc, (vop_t *)fifo_close }, /* close */ - { &vop_access_desc, (vop_t *)cd9660_access }, /* access */ - { &vop_getattr_desc, (vop_t *)cd9660_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)cd9660_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)fifo_read }, /* read */ - { &vop_write_desc, (vop_t *)fifo_write }, /* write */ - { &vop_lease_desc, (vop_t *)fifo_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)fifo_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)fifo_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fifo_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fifo_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fifo_link } , /* link */ - { &vop_rename_desc, (vop_t *)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)cd9660_inactive },/* inactive */ - { &vop_reclaim_desc, (vop_t *)cd9660_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)cd9660_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)cd9660_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fifo_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)cd9660_print }, /* print */ - { &vop_islocked_desc, (vop_t *)cd9660_islocked },/* islocked */ - { &vop_pathconf_desc, (vop_t *)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)fifo_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)fifo_valloc }, /* valloc */ -/* XXX: vop_reallocpages */ - { &vop_vfree_desc, (vop_t *)fifo_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)fifo_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)cd9660_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fifo_abortop }, + { &vop_access_desc, (vop_t *) cd9660_access }, + { &vop_advlock_desc, (vop_t *) fifo_advlock }, + { &vop_blkatoff_desc, (vop_t *) fifo_blkatoff }, + { &vop_bmap_desc, (vop_t *) fifo_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) fifo_close }, + { &vop_create_desc, (vop_t *) fifo_create }, + { &vop_fsync_desc, (vop_t *) fifo_fsync }, + { &vop_getattr_desc, (vop_t *) cd9660_getattr }, + { &vop_inactive_desc, (vop_t *) cd9660_inactive }, + { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, + { &vop_islocked_desc, (vop_t *) cd9660_islocked }, + { &vop_lease_desc, (vop_t *) fifo_lease_check }, + { &vop_link_desc, (vop_t *) fifo_link }, + { &vop_lock_desc, (vop_t *) cd9660_lock }, + { &vop_lookup_desc, (vop_t *) fifo_lookup }, + { &vop_mkdir_desc, (vop_t *) fifo_mkdir }, + { &vop_mknod_desc, (vop_t *) fifo_mknod }, + { &vop_mmap_desc, (vop_t *) fifo_mmap }, + { &vop_open_desc, (vop_t *) fifo_open }, + { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_poll_desc, (vop_t *) fifo_poll }, + { &vop_print_desc, (vop_t *) cd9660_print }, + { &vop_read_desc, (vop_t *) fifo_read }, + { &vop_readdir_desc, (vop_t *) fifo_readdir }, + { &vop_readlink_desc, (vop_t *) fifo_readlink }, + { &vop_reclaim_desc, (vop_t *) cd9660_reclaim }, + { &vop_remove_desc, (vop_t *) fifo_remove }, + { &vop_rename_desc, (vop_t *) fifo_rename }, + { &vop_revoke_desc, (vop_t *) fifo_revoke }, + { &vop_rmdir_desc, (vop_t *) fifo_rmdir }, + { &vop_seek_desc, (vop_t *) fifo_seek }, + { &vop_setattr_desc, (vop_t *) cd9660_setattr }, + { &vop_strategy_desc, (vop_t *) fifo_strategy }, + { &vop_symlink_desc, (vop_t *) fifo_symlink }, + { &vop_truncate_desc, (vop_t *) fifo_truncate }, + { &vop_unlock_desc, (vop_t *) cd9660_unlock }, + { &vop_update_desc, (vop_t *) cd9660_update }, + { &vop_valloc_desc, (vop_t *) fifo_valloc }, + { &vop_vfree_desc, (vop_t *) fifo_vfree }, + { &vop_write_desc, (vop_t *) fifo_write }, { NULL, NULL } }; static struct vnodeopv_desc cd9660_fifoop_opv_desc = diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index a8856f9..d4bb0ae 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.14 1997/09/02 20:06:08 bde Exp $ + * $Id: dead_vnops.c,v 1.15 1997/09/14 02:57:46 peter Exp $ */ #include <sys/param.h> @@ -89,54 +89,47 @@ static int dead_print __P((struct vop_print_args *)); vop_t **dead_vnodeop_p; static struct vnodeopv_entry_desc dead_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)dead_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)dead_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)dead_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)dead_open }, /* open */ - { &vop_close_desc, (vop_t *)dead_close }, /* close */ - { &vop_access_desc, (vop_t *)dead_access }, /* access */ - { &vop_getattr_desc, (vop_t *)dead_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)dead_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)dead_read }, /* read */ - { &vop_write_desc, (vop_t *)dead_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)dead_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)dead_poll }, /* poll */ -/* XXX: vop_revoke */ - { &vop_mmap_desc, (vop_t *)dead_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)dead_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)dead_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)dead_remove }, /* remove */ - { &vop_link_desc, (vop_t *)dead_link }, /* link */ - { &vop_rename_desc, (vop_t *)dead_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)dead_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)dead_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)dead_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)dead_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)dead_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)dead_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)dead_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)dead_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)dead_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)dead_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)dead_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)dead_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)dead_print }, /* print */ - { &vop_islocked_desc, (vop_t *)dead_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)dead_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)dead_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)dead_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)dead_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)dead_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)dead_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)dead_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)dead_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) dead_abortop }, + { &vop_access_desc, (vop_t *) dead_access }, + { &vop_advlock_desc, (vop_t *) dead_advlock }, + { &vop_blkatoff_desc, (vop_t *) dead_blkatoff }, + { &vop_bmap_desc, (vop_t *) dead_bmap }, + { &vop_bwrite_desc, (vop_t *) dead_bwrite }, + { &vop_close_desc, (vop_t *) dead_close }, + { &vop_create_desc, (vop_t *) dead_create }, + { &vop_fsync_desc, (vop_t *) dead_fsync }, + { &vop_getattr_desc, (vop_t *) dead_getattr }, + { &vop_inactive_desc, (vop_t *) dead_inactive }, + { &vop_ioctl_desc, (vop_t *) dead_ioctl }, + { &vop_islocked_desc, (vop_t *) dead_islocked }, + { &vop_link_desc, (vop_t *) dead_link }, + { &vop_lock_desc, (vop_t *) dead_lock }, + { &vop_lookup_desc, (vop_t *) dead_lookup }, + { &vop_mkdir_desc, (vop_t *) dead_mkdir }, + { &vop_mknod_desc, (vop_t *) dead_mknod }, + { &vop_mmap_desc, (vop_t *) dead_mmap }, + { &vop_open_desc, (vop_t *) dead_open }, + { &vop_pathconf_desc, (vop_t *) dead_pathconf }, + { &vop_poll_desc, (vop_t *) dead_poll }, + { &vop_print_desc, (vop_t *) dead_print }, + { &vop_read_desc, (vop_t *) dead_read }, + { &vop_readdir_desc, (vop_t *) dead_readdir }, + { &vop_readlink_desc, (vop_t *) dead_readlink }, + { &vop_reclaim_desc, (vop_t *) dead_reclaim }, + { &vop_remove_desc, (vop_t *) dead_remove }, + { &vop_rename_desc, (vop_t *) dead_rename }, + { &vop_rmdir_desc, (vop_t *) dead_rmdir }, + { &vop_seek_desc, (vop_t *) dead_seek }, + { &vop_setattr_desc, (vop_t *) dead_setattr }, + { &vop_strategy_desc, (vop_t *) dead_strategy }, + { &vop_symlink_desc, (vop_t *) dead_symlink }, + { &vop_truncate_desc, (vop_t *) dead_truncate }, + { &vop_unlock_desc, (vop_t *) dead_unlock }, + { &vop_update_desc, (vop_t *) dead_update }, + { &vop_valloc_desc, (vop_t *) dead_valloc }, + { &vop_vfree_desc, (vop_t *) dead_vfree }, + { &vop_write_desc, (vop_t *) dead_write }, { NULL, NULL } }; static struct vnodeopv_desc dead_vnodeop_opv_desc = diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c index 35b62af..4fb66a1 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.39 1997/09/14 02:57:48 peter Exp $ + * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.40 1997/09/21 04:23:15 dyson Exp $ * * symlinks can wait 'til later. */ @@ -1689,54 +1689,47 @@ 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_lookup_desc, (vop_t *)devfs_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)devfs_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)devfs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)devfs_open }, /* open */ - { &vop_close_desc, (vop_t *)devfs_close }, /* close */ - { &vop_access_desc, (vop_t *)devfs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)devfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)devfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)devfs_read }, /* read */ - { &vop_write_desc, (vop_t *)devfs_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)devfs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)devfs_poll }, /* poll */ -/* XXX: vop_revoke */ - { &vop_mmap_desc, (vop_t *)devfs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)devfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)devfs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)devfs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)devfs_link }, /* link */ - { &vop_rename_desc, (vop_t *)devfs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)devfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)devfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)devfs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)devfs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)devfs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)devfs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)devfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)devfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)devfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)devfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)devfs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)devfs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)devfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)devfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)devfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)devfs_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)devfs_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)devfs_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)devfs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)devfs_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)devfs_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)devfs_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) devfs_abortop }, + { &vop_access_desc, (vop_t *) devfs_access }, + { &vop_advlock_desc, (vop_t *) devfs_advlock }, + { &vop_blkatoff_desc, (vop_t *) devfs_blkatoff }, + { &vop_bmap_desc, (vop_t *) devfs_bmap }, + { &vop_bwrite_desc, (vop_t *) devfs_bwrite }, + { &vop_close_desc, (vop_t *) devfs_close }, + { &vop_create_desc, (vop_t *) devfs_create }, + { &vop_fsync_desc, (vop_t *) devfs_fsync }, + { &vop_getattr_desc, (vop_t *) devfs_getattr }, + { &vop_inactive_desc, (vop_t *) devfs_inactive }, + { &vop_ioctl_desc, (vop_t *) devfs_ioctl }, + { &vop_islocked_desc, (vop_t *) devfs_islocked }, + { &vop_link_desc, (vop_t *) devfs_link }, + { &vop_lock_desc, (vop_t *) devfs_lock }, + { &vop_lookup_desc, (vop_t *) devfs_lookup }, + { &vop_mkdir_desc, (vop_t *) devfs_mkdir }, + { &vop_mknod_desc, (vop_t *) devfs_mknod }, + { &vop_mmap_desc, (vop_t *) devfs_mmap }, + { &vop_open_desc, (vop_t *) devfs_open }, + { &vop_pathconf_desc, (vop_t *) devfs_pathconf }, + { &vop_poll_desc, (vop_t *) devfs_poll }, + { &vop_print_desc, (vop_t *) devfs_print }, + { &vop_read_desc, (vop_t *) devfs_read }, + { &vop_readdir_desc, (vop_t *) devfs_readdir }, + { &vop_readlink_desc, (vop_t *) devfs_readlink }, + { &vop_reclaim_desc, (vop_t *) devfs_reclaim }, + { &vop_remove_desc, (vop_t *) devfs_remove }, + { &vop_rename_desc, (vop_t *) devfs_rename }, + { &vop_rmdir_desc, (vop_t *) devfs_rmdir }, + { &vop_seek_desc, (vop_t *) devfs_seek }, + { &vop_setattr_desc, (vop_t *) devfs_setattr }, + { &vop_strategy_desc, (vop_t *) devfs_strategy }, + { &vop_symlink_desc, (vop_t *) devfs_symlink }, + { &vop_truncate_desc, (vop_t *) devfs_truncate }, + { &vop_unlock_desc, (vop_t *) devfs_unlock }, + { &vop_update_desc, (vop_t *) devfs_update }, + { &vop_valloc_desc, (vop_t *) devfs_valloc }, + { &vop_vfree_desc, (vop_t *) devfs_vfree }, + { &vop_write_desc, (vop_t *) devfs_write }, { NULL, NULL } }; static struct vnodeopv_desc devfs_vnodeop_opv_desc = @@ -1786,54 +1779,48 @@ VNODEOP_SET(devfs_vnodeop_opv_desc); vop_t **dev_spec_vnodeop_p; static struct vnodeopv_entry_desc dev_spec_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)spec_close }, /* close */ - { &vop_access_desc, (vop_t *)devfs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)devfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)devfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)devfs_read }, /* read */ - { &vop_write_desc, (vop_t *)devfs_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ -/* XXX: vop_revoke */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)spec_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)devfs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)spec_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)devfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)spec_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)spec_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)spec_print }, /* print */ - { &vop_islocked_desc, (vop_t *)spec_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)spec_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)spec_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)spec_update }, /* update */ - { &vop_getpages_desc, (vop_t *)spec_getpages}, /* getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) devfs_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_blkatoff_desc, (vop_t *) spec_blkatoff }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) spec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) spec_fsync }, + { &vop_getattr_desc, (vop_t *) devfs_getattr }, + { &vop_getpages_desc, (vop_t *) spec_getpages }, + { &vop_inactive_desc, (vop_t *) spec_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) spec_islocked }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) spec_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) spec_print }, + { &vop_read_desc, (vop_t *) devfs_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reclaim_desc, (vop_t *) devfs_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) devfs_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) devfs_symlink }, + { &vop_truncate_desc, (vop_t *) spec_truncate }, + { &vop_unlock_desc, (vop_t *) spec_unlock }, + { &vop_update_desc, (vop_t *) spec_update }, + { &vop_valloc_desc, (vop_t *) spec_valloc }, + { &vop_vfree_desc, (vop_t *) spec_vfree }, + { &vop_write_desc, (vop_t *) devfs_write }, { NULL, NULL } }; static struct vnodeopv_desc dev_spec_vnodeop_opv_desc = diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c index f63bd1b..dca208e 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.25 1997/09/07 05:25:53 bde Exp $ + * $Id: fdesc_vnops.c,v 1.26 1997/09/14 02:57:50 peter Exp $ */ /* @@ -942,54 +942,48 @@ fdesc_badop() #define fdesc_bwrite ((int (*) __P((struct vop_bwrite_args *)))eopnotsupp) static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fdesc_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fdesc_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)fdesc_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fdesc_open }, /* open */ - { &vop_close_desc, (vop_t *)fdesc_close }, /* close */ - { &vop_access_desc, (vop_t *)fdesc_access }, /* access */ - { &vop_getattr_desc, (vop_t *)fdesc_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)fdesc_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)fdesc_read }, /* read */ -/* XXX: vop_lease */ - { &vop_write_desc, (vop_t *)fdesc_write }, /* write */ - { &vop_ioctl_desc, (vop_t *)fdesc_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fdesc_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)fdesc_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)fdesc_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)fdesc_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fdesc_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fdesc_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fdesc_link }, /* link */ - { &vop_rename_desc, (vop_t *)fdesc_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fdesc_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fdesc_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fdesc_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fdesc_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fdesc_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fdesc_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)fdesc_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)fdesc_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)fdesc_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)fdesc_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fdesc_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fdesc_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)fdesc_print }, /* print */ - { &vop_islocked_desc, (vop_t *)fdesc_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)fdesc_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fdesc_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)fdesc_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)fdesc_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)fdesc_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)fdesc_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)fdesc_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)fdesc_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fdesc_abortop }, + { &vop_access_desc, (vop_t *) fdesc_access }, + { &vop_advlock_desc, (vop_t *) fdesc_advlock }, + { &vop_blkatoff_desc, (vop_t *) fdesc_blkatoff }, + { &vop_bmap_desc, (vop_t *) fdesc_bmap }, + { &vop_bwrite_desc, (vop_t *) fdesc_bwrite }, + { &vop_close_desc, (vop_t *) fdesc_close }, + { &vop_create_desc, (vop_t *) fdesc_create }, + { &vop_fsync_desc, (vop_t *) fdesc_fsync }, + { &vop_getattr_desc, (vop_t *) fdesc_getattr }, + { &vop_inactive_desc, (vop_t *) fdesc_inactive }, + { &vop_ioctl_desc, (vop_t *) fdesc_ioctl }, + { &vop_islocked_desc, (vop_t *) fdesc_islocked }, + { &vop_link_desc, (vop_t *) fdesc_link }, + { &vop_lock_desc, (vop_t *) fdesc_lock }, + { &vop_lookup_desc, (vop_t *) fdesc_lookup }, + { &vop_mkdir_desc, (vop_t *) fdesc_mkdir }, + { &vop_mknod_desc, (vop_t *) fdesc_mknod }, + { &vop_mmap_desc, (vop_t *) fdesc_mmap }, + { &vop_open_desc, (vop_t *) fdesc_open }, + { &vop_pathconf_desc, (vop_t *) fdesc_pathconf }, + { &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_remove_desc, (vop_t *) fdesc_remove }, + { &vop_rename_desc, (vop_t *) fdesc_rename }, + { &vop_revoke_desc, (vop_t *) fdesc_revoke }, + { &vop_rmdir_desc, (vop_t *) fdesc_rmdir }, + { &vop_seek_desc, (vop_t *) fdesc_seek }, + { &vop_setattr_desc, (vop_t *) fdesc_setattr }, + { &vop_strategy_desc, (vop_t *) fdesc_strategy }, + { &vop_symlink_desc, (vop_t *) fdesc_symlink }, + { &vop_truncate_desc, (vop_t *) fdesc_truncate }, + { &vop_unlock_desc, (vop_t *) fdesc_unlock }, + { &vop_update_desc, (vop_t *) fdesc_update }, + { &vop_valloc_desc, (vop_t *) fdesc_valloc }, + { &vop_vfree_desc, (vop_t *) fdesc_vfree }, + { &vop_write_desc, (vop_t *) fdesc_write }, { NULL, NULL } }; static struct vnodeopv_desc fdesc_vnodeop_opv_desc = diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index 27553a9..1cb11d7 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.27 1997/09/14 02:57:53 peter Exp $ + * $Id: fifo_vnops.c,v 1.28 1997/10/12 20:24:42 phk Exp $ */ #include <sys/param.h> @@ -65,50 +65,49 @@ static int fifo_print __P((struct vop_print_args *)); vop_t **fifo_vnodeop_p; static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fifo_create }, /* create */ - { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fifo_open }, /* open */ - { &vop_close_desc, (vop_t *)fifo_close }, /* close */ - { &vop_access_desc, (vop_t *)fifo_access }, /* access */ - { &vop_getattr_desc, (vop_t *)fifo_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)fifo_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)fifo_read }, /* read */ - { &vop_write_desc, (vop_t *)fifo_write }, /* write */ - { &vop_lease_desc, (vop_t *)fifo_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)fifo_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)fifo_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fifo_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fifo_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fifo_link }, /* link */ - { &vop_rename_desc, (vop_t *)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)fifo_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)fifo_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)fifo_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)fifo_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fifo_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)fifo_print }, /* print */ - { &vop_islocked_desc, (vop_t *)fifo_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)fifo_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)fifo_valloc }, /* valloc */ - { &vop_vfree_desc, (vop_t *)fifo_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)fifo_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)fifo_update }, /* update */ - { &vop_bwrite_desc, (vop_t *)fifo_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fifo_abortop }, + { &vop_access_desc, (vop_t *) fifo_access }, + { &vop_advlock_desc, (vop_t *) fifo_advlock }, + { &vop_blkatoff_desc, (vop_t *) fifo_blkatoff }, + { &vop_bmap_desc, (vop_t *) fifo_bmap }, + { &vop_bwrite_desc, (vop_t *) fifo_bwrite }, + { &vop_close_desc, (vop_t *) fifo_close }, + { &vop_create_desc, (vop_t *) fifo_create }, + { &vop_fsync_desc, (vop_t *) fifo_fsync }, + { &vop_getattr_desc, (vop_t *) fifo_getattr }, + { &vop_inactive_desc, (vop_t *) fifo_inactive }, + { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, + { &vop_islocked_desc, (vop_t *) fifo_islocked }, + { &vop_lease_desc, (vop_t *) fifo_lease_check }, + { &vop_link_desc, (vop_t *) fifo_link }, + { &vop_lock_desc, (vop_t *) fifo_lock }, + { &vop_lookup_desc, (vop_t *) fifo_lookup }, + { &vop_mkdir_desc, (vop_t *) fifo_mkdir }, + { &vop_mknod_desc, (vop_t *) fifo_mknod }, + { &vop_mmap_desc, (vop_t *) fifo_mmap }, + { &vop_open_desc, (vop_t *) fifo_open }, + { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_poll_desc, (vop_t *) fifo_poll }, + { &vop_print_desc, (vop_t *) fifo_print }, + { &vop_read_desc, (vop_t *) fifo_read }, + { &vop_readdir_desc, (vop_t *) fifo_readdir }, + { &vop_readlink_desc, (vop_t *) fifo_readlink }, + { &vop_reclaim_desc, (vop_t *) fifo_reclaim }, + { &vop_remove_desc, (vop_t *) fifo_remove }, + { &vop_rename_desc, (vop_t *) fifo_rename }, + { &vop_revoke_desc, (vop_t *) fifo_revoke }, + { &vop_rmdir_desc, (vop_t *) fifo_rmdir }, + { &vop_seek_desc, (vop_t *) fifo_seek }, + { &vop_setattr_desc, (vop_t *) fifo_setattr }, + { &vop_strategy_desc, (vop_t *) fifo_strategy }, + { &vop_symlink_desc, (vop_t *) fifo_symlink }, + { &vop_truncate_desc, (vop_t *) fifo_truncate }, + { &vop_unlock_desc, (vop_t *) fifo_unlock }, + { &vop_update_desc, (vop_t *) fifo_update }, + { &vop_valloc_desc, (vop_t *) fifo_valloc }, + { &vop_vfree_desc, (vop_t *) fifo_vfree }, + { &vop_write_desc, (vop_t *) fifo_write }, { NULL, NULL } }; static struct vnodeopv_desc fifo_vnodeop_opv_desc = diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c index 6232ec3..bfa02ce 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.20 1997/09/02 20:06:12 bde Exp $ + * $Id: kernfs_vnops.c,v 1.21 1997/09/14 02:57:55 peter Exp $ */ /* @@ -748,54 +748,48 @@ kernfs_badop() vop_t **kernfs_vnodeop_p; static struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)kernfs_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)kernfs_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)kernfs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)kernfs_open }, /* open */ - { &vop_close_desc, (vop_t *)kernfs_close }, /* close */ - { &vop_access_desc, (vop_t *)kernfs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)kernfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)kernfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)kernfs_read }, /* read */ - { &vop_write_desc, (vop_t *)kernfs_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)kernfs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)kernfs_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)kernfs_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)kernfs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)kernfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)kernfs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)kernfs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)kernfs_link }, /* link */ - { &vop_rename_desc, (vop_t *)kernfs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)kernfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)kernfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)kernfs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)kernfs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)kernfs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)kernfs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)kernfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)kernfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)kernfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)kernfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)kernfs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)kernfs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)kernfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)kernfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)kernfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)kernfs_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)kernfs_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)kernfs_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)kernfs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)kernfs_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)kernfs_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)kernfs_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) kernfs_abortop }, + { &vop_access_desc, (vop_t *) kernfs_access }, + { &vop_advlock_desc, (vop_t *) kernfs_advlock }, + { &vop_blkatoff_desc, (vop_t *) kernfs_blkatoff }, + { &vop_bmap_desc, (vop_t *) kernfs_bmap }, + { &vop_bwrite_desc, (vop_t *) kernfs_bwrite }, + { &vop_close_desc, (vop_t *) kernfs_close }, + { &vop_create_desc, (vop_t *) kernfs_create }, + { &vop_fsync_desc, (vop_t *) kernfs_fsync }, + { &vop_getattr_desc, (vop_t *) kernfs_getattr }, + { &vop_inactive_desc, (vop_t *) kernfs_inactive }, + { &vop_ioctl_desc, (vop_t *) kernfs_ioctl }, + { &vop_islocked_desc, (vop_t *) kernfs_islocked }, + { &vop_link_desc, (vop_t *) kernfs_link }, + { &vop_lock_desc, (vop_t *) kernfs_lock }, + { &vop_lookup_desc, (vop_t *) kernfs_lookup }, + { &vop_mkdir_desc, (vop_t *) kernfs_mkdir }, + { &vop_mknod_desc, (vop_t *) kernfs_mknod }, + { &vop_mmap_desc, (vop_t *) kernfs_mmap }, + { &vop_open_desc, (vop_t *) kernfs_open }, + { &vop_pathconf_desc, (vop_t *) kernfs_pathconf }, + { &vop_poll_desc, (vop_t *) kernfs_poll }, + { &vop_print_desc, (vop_t *) kernfs_print }, + { &vop_read_desc, (vop_t *) kernfs_read }, + { &vop_readdir_desc, (vop_t *) kernfs_readdir }, + { &vop_readlink_desc, (vop_t *) kernfs_readlink }, + { &vop_reclaim_desc, (vop_t *) kernfs_reclaim }, + { &vop_remove_desc, (vop_t *) kernfs_remove }, + { &vop_rename_desc, (vop_t *) kernfs_rename }, + { &vop_revoke_desc, (vop_t *) kernfs_revoke }, + { &vop_rmdir_desc, (vop_t *) kernfs_rmdir }, + { &vop_seek_desc, (vop_t *) kernfs_seek }, + { &vop_setattr_desc, (vop_t *) kernfs_setattr }, + { &vop_strategy_desc, (vop_t *) kernfs_strategy }, + { &vop_symlink_desc, (vop_t *) kernfs_symlink }, + { &vop_truncate_desc, (vop_t *) kernfs_truncate }, + { &vop_unlock_desc, (vop_t *) kernfs_unlock }, + { &vop_update_desc, (vop_t *) kernfs_update }, + { &vop_valloc_desc, (vop_t *) kernfs_valloc }, + { &vop_vfree_desc, (vop_t *) kernfs_vfree }, + { &vop_write_desc, (vop_t *) kernfs_write }, { NULL, NULL } }; static struct vnodeopv_desc kernfs_vnodeop_opv_desc = diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c index 9db6725..f9f7226 100644 --- a/sys/miscfs/nullfs/null_vnops.c +++ b/sys/miscfs/nullfs/null_vnops.c @@ -37,11 +37,11 @@ * * Ancestors: * @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92 - * $Id: null_vnops.c,v 1.21 1997/08/02 14:32:05 bde Exp $ + * $Id: null_vnops.c,v 1.22 1997/09/18 18:33:18 phk Exp $ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $Id: null_vnops.c,v 1.21 1997/08/02 14:32:05 bde Exp $ + * $Id: null_vnops.c,v 1.22 1997/09/18 18:33:18 phk Exp $ */ /* @@ -639,21 +639,18 @@ null_bwrite(ap) */ vop_t **null_vnodeop_p; static struct vnodeopv_entry_desc null_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)null_bypass }, - - { &vop_lookup_desc, (vop_t *)null_lookup }, - { &vop_setattr_desc, (vop_t *)null_setattr }, - { &vop_getattr_desc, (vop_t *)null_getattr }, - { &vop_access_desc, (vop_t *)null_access }, - { &vop_lock_desc, (vop_t *)null_lock }, - { &vop_unlock_desc, (vop_t *)null_unlock }, - { &vop_inactive_desc, (vop_t *)null_inactive }, - { &vop_reclaim_desc, (vop_t *)null_reclaim }, - { &vop_print_desc, (vop_t *)null_print }, - - { &vop_strategy_desc, (vop_t *)null_strategy }, - { &vop_bwrite_desc, (vop_t *)null_bwrite }, - + { &vop_default_desc, (vop_t *) null_bypass }, + { &vop_access_desc, (vop_t *) null_access }, + { &vop_bwrite_desc, (vop_t *) null_bwrite }, + { &vop_getattr_desc, (vop_t *) null_getattr }, + { &vop_inactive_desc, (vop_t *) null_inactive }, + { &vop_lock_desc, (vop_t *) null_lock }, + { &vop_lookup_desc, (vop_t *) null_lookup }, + { &vop_print_desc, (vop_t *) null_print }, + { &vop_reclaim_desc, (vop_t *) null_reclaim }, + { &vop_setattr_desc, (vop_t *) null_setattr }, + { &vop_strategy_desc, (vop_t *) null_strategy }, + { &vop_unlock_desc, (vop_t *) null_unlock }, { NULL, NULL } }; static struct vnodeopv_desc null_vnodeop_opv_desc = diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c index a8b05cd..75a2101 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.20 1997/08/16 19:15:18 wollman Exp $ + * $Id: portal_vnops.c,v 1.21 1997/09/14 02:57:57 peter Exp $ */ /* @@ -693,54 +693,48 @@ portal_badop() vop_t **portal_vnodeop_p; static struct vnodeopv_entry_desc portal_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)portal_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)portal_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)portal_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)portal_open }, /* open */ - { &vop_close_desc, (vop_t *)portal_close }, /* close */ - { &vop_access_desc, (vop_t *)portal_access }, /* access */ - { &vop_getattr_desc, (vop_t *)portal_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)portal_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)portal_read }, /* read */ - { &vop_write_desc, (vop_t *)portal_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)portal_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)portal_poll }, /* poll */ - { &vop_mmap_desc, (vop_t *)portal_mmap }, /* mmap */ - { &vop_revoke_desc, (vop_t *)portal_revoke }, /* revoke */ - { &vop_fsync_desc, (vop_t *)portal_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)portal_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)portal_remove }, /* remove */ - { &vop_link_desc, (vop_t *)portal_link }, /* link */ - { &vop_rename_desc, (vop_t *)portal_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)portal_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)portal_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)portal_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)portal_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)portal_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)portal_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)portal_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)portal_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)portal_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)portal_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)portal_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)portal_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)portal_print }, /* print */ - { &vop_islocked_desc, (vop_t *)portal_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)portal_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)portal_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)portal_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)portal_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)portal_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)portal_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)portal_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)portal_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) portal_abortop }, + { &vop_access_desc, (vop_t *) portal_access }, + { &vop_advlock_desc, (vop_t *) portal_advlock }, + { &vop_blkatoff_desc, (vop_t *) portal_blkatoff }, + { &vop_bmap_desc, (vop_t *) portal_bmap }, + { &vop_bwrite_desc, (vop_t *) portal_bwrite }, + { &vop_close_desc, (vop_t *) portal_close }, + { &vop_create_desc, (vop_t *) portal_create }, + { &vop_fsync_desc, (vop_t *) portal_fsync }, + { &vop_getattr_desc, (vop_t *) portal_getattr }, + { &vop_inactive_desc, (vop_t *) portal_inactive }, + { &vop_ioctl_desc, (vop_t *) portal_ioctl }, + { &vop_islocked_desc, (vop_t *) portal_islocked }, + { &vop_link_desc, (vop_t *) portal_link }, + { &vop_lock_desc, (vop_t *) portal_lock }, + { &vop_lookup_desc, (vop_t *) portal_lookup }, + { &vop_mkdir_desc, (vop_t *) portal_mkdir }, + { &vop_mknod_desc, (vop_t *) portal_mknod }, + { &vop_mmap_desc, (vop_t *) portal_mmap }, + { &vop_open_desc, (vop_t *) portal_open }, + { &vop_pathconf_desc, (vop_t *) portal_pathconf }, + { &vop_poll_desc, (vop_t *) portal_poll }, + { &vop_print_desc, (vop_t *) portal_print }, + { &vop_read_desc, (vop_t *) portal_read }, + { &vop_readdir_desc, (vop_t *) portal_readdir }, + { &vop_readlink_desc, (vop_t *) portal_readlink }, + { &vop_reclaim_desc, (vop_t *) portal_reclaim }, + { &vop_remove_desc, (vop_t *) portal_remove }, + { &vop_rename_desc, (vop_t *) portal_rename }, + { &vop_revoke_desc, (vop_t *) portal_revoke }, + { &vop_rmdir_desc, (vop_t *) portal_rmdir }, + { &vop_seek_desc, (vop_t *) portal_seek }, + { &vop_setattr_desc, (vop_t *) portal_setattr }, + { &vop_strategy_desc, (vop_t *) portal_strategy }, + { &vop_symlink_desc, (vop_t *) portal_symlink }, + { &vop_truncate_desc, (vop_t *) portal_truncate }, + { &vop_unlock_desc, (vop_t *) portal_unlock }, + { &vop_update_desc, (vop_t *) portal_update }, + { &vop_valloc_desc, (vop_t *) portal_valloc }, + { &vop_vfree_desc, (vop_t *) portal_vfree }, + { &vop_write_desc, (vop_t *) portal_write }, { NULL, NULL } }; static struct vnodeopv_desc portal_vnodeop_opv_desc = diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index 7912c95..0d989c4 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.32 1997/09/14 02:57:58 peter Exp $ + * $Id: procfs_vnops.c,v 1.33 1997/09/21 04:23:23 dyson Exp $ */ /* @@ -968,54 +968,47 @@ atopid(b, len) */ vop_t **procfs_vnodeop_p; static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)procfs_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)procfs_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)procfs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)procfs_open }, /* open */ - { &vop_close_desc, (vop_t *)procfs_close }, /* close */ - { &vop_access_desc, (vop_t *)procfs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)procfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)procfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)procfs_read }, /* read */ - { &vop_write_desc, (vop_t *)procfs_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)procfs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)procfs_poll }, /* poll */ - { &vop_mmap_desc, (vop_t *)procfs_mmap }, /* mmap */ - { &vop_revoke_desc, (vop_t *)procfs_revoke }, /* revoke */ - { &vop_fsync_desc, (vop_t *)procfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)procfs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)procfs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)procfs_link }, /* link */ - { &vop_rename_desc, (vop_t *)procfs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)procfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)procfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)procfs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)procfs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)procfs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)procfs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)procfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)procfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)procfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)procfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)procfs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)procfs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)procfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)procfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)procfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)procfs_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)procfs_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)procfs_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)procfs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)procfs_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)procfs_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ -/* XXX: vop_bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) procfs_abortop }, + { &vop_access_desc, (vop_t *) procfs_access }, + { &vop_advlock_desc, (vop_t *) procfs_advlock }, + { &vop_blkatoff_desc, (vop_t *) procfs_blkatoff }, + { &vop_bmap_desc, (vop_t *) procfs_bmap }, + { &vop_close_desc, (vop_t *) procfs_close }, + { &vop_create_desc, (vop_t *) procfs_create }, + { &vop_fsync_desc, (vop_t *) procfs_fsync }, + { &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 *) procfs_islocked }, + { &vop_link_desc, (vop_t *) procfs_link }, + { &vop_lock_desc, (vop_t *) procfs_lock }, + { &vop_lookup_desc, (vop_t *) procfs_lookup }, + { &vop_mkdir_desc, (vop_t *) procfs_mkdir }, + { &vop_mknod_desc, (vop_t *) procfs_mknod }, + { &vop_mmap_desc, (vop_t *) procfs_mmap }, + { &vop_open_desc, (vop_t *) procfs_open }, + { &vop_pathconf_desc, (vop_t *) procfs_pathconf }, + { &vop_poll_desc, (vop_t *) procfs_poll }, + { &vop_print_desc, (vop_t *) procfs_print }, + { &vop_read_desc, (vop_t *) procfs_read }, + { &vop_readdir_desc, (vop_t *) procfs_readdir }, + { &vop_readlink_desc, (vop_t *) procfs_readlink }, + { &vop_reclaim_desc, (vop_t *) procfs_reclaim }, + { &vop_remove_desc, (vop_t *) procfs_remove }, + { &vop_rename_desc, (vop_t *) procfs_rename }, + { &vop_revoke_desc, (vop_t *) procfs_revoke }, + { &vop_rmdir_desc, (vop_t *) procfs_rmdir }, + { &vop_seek_desc, (vop_t *) procfs_seek }, + { &vop_setattr_desc, (vop_t *) procfs_setattr }, + { &vop_strategy_desc, (vop_t *) procfs_strategy }, + { &vop_symlink_desc, (vop_t *) procfs_symlink }, + { &vop_truncate_desc, (vop_t *) procfs_truncate }, + { &vop_unlock_desc, (vop_t *) procfs_unlock }, + { &vop_update_desc, (vop_t *) procfs_update }, + { &vop_valloc_desc, (vop_t *) procfs_valloc }, + { &vop_vfree_desc, (vop_t *) procfs_vfree }, + { &vop_write_desc, (vop_t *) procfs_write }, { NULL, NULL } }; static struct vnodeopv_desc procfs_vnodeop_opv_desc = diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index dd05fc0..d798e81 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.42 1997/09/14 02:58:02 peter Exp $ + * $Id: spec_vnops.c,v 1.43 1997/09/27 13:39:20 kato Exp $ */ #include <sys/param.h> @@ -64,54 +64,50 @@ static int spec_getattr __P((struct vop_getattr_args *)); struct vnode *speclisth[SPECHSZ]; vop_t **spec_vnodeop_p; static struct vnodeopv_entry_desc spec_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)spec_close }, /* close */ - { &vop_access_desc, (vop_t *)spec_access }, /* access */ - { &vop_getattr_desc, (vop_t *)spec_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)spec_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)spec_read }, /* read */ - { &vop_write_desc, (vop_t *)spec_write }, /* write */ - { &vop_lease_desc, (vop_t *)spec_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)spec_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)spec_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)spec_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)spec_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)spec_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)spec_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)spec_print }, /* print */ - { &vop_islocked_desc, (vop_t *)spec_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)spec_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)spec_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)spec_update }, /* update */ - { &vop_getpages_desc, (vop_t *)spec_getpages}, /* getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) spec_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_blkatoff_desc, (vop_t *) spec_blkatoff }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) spec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) spec_fsync }, + { &vop_getattr_desc, (vop_t *) spec_getattr }, + { &vop_getpages_desc, (vop_t *) spec_getpages }, + { &vop_inactive_desc, (vop_t *) spec_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) spec_islocked }, + { &vop_lease_desc, (vop_t *) spec_lease_check }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) spec_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) spec_print }, + { &vop_read_desc, (vop_t *) spec_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reclaim_desc, (vop_t *) spec_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_revoke_desc, (vop_t *) spec_revoke }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) spec_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) spec_symlink }, + { &vop_truncate_desc, (vop_t *) spec_truncate }, + { &vop_unlock_desc, (vop_t *) spec_unlock }, + { &vop_update_desc, (vop_t *) spec_update }, + { &vop_valloc_desc, (vop_t *) spec_valloc }, + { &vop_vfree_desc, (vop_t *) spec_vfree }, + { &vop_write_desc, (vop_t *) spec_write }, { NULL, NULL } }; static struct vnodeopv_desc spec_vnodeop_opv_desc = diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c index 64d5fba..dc6d9d9 100644 --- a/sys/miscfs/umapfs/umap_vnops.c +++ b/sys/miscfs/umapfs/umap_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95 - * $Id: umap_vnops.c,v 1.18 1997/08/02 14:32:26 bde Exp $ + * $Id: umap_vnops.c,v 1.19 1997/09/18 18:33:23 phk Exp $ */ /* @@ -529,19 +529,16 @@ umap_rename(ap) */ vop_t **umap_vnodeop_p; static struct vnodeopv_entry_desc umap_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)umap_bypass }, - - { &vop_getattr_desc, (vop_t *)umap_getattr }, - { &vop_lock_desc, (vop_t *)umap_lock }, - { &vop_unlock_desc, (vop_t *)umap_unlock }, - { &vop_inactive_desc, (vop_t *)umap_inactive }, - { &vop_reclaim_desc, (vop_t *)umap_reclaim }, - { &vop_print_desc, (vop_t *)umap_print }, - { &vop_rename_desc, (vop_t *)umap_rename }, - - { &vop_strategy_desc, (vop_t *)umap_strategy }, - { &vop_bwrite_desc, (vop_t *)umap_bwrite }, - + { &vop_default_desc, (vop_t *) umap_bypass }, + { &vop_bwrite_desc, (vop_t *) umap_bwrite }, + { &vop_getattr_desc, (vop_t *) umap_getattr }, + { &vop_inactive_desc, (vop_t *) umap_inactive }, + { &vop_lock_desc, (vop_t *) umap_lock }, + { &vop_print_desc, (vop_t *) umap_print }, + { &vop_reclaim_desc, (vop_t *) umap_reclaim }, + { &vop_rename_desc, (vop_t *) umap_rename }, + { &vop_strategy_desc, (vop_t *) umap_strategy }, + { &vop_unlock_desc, (vop_t *) umap_unlock }, { NULL, NULL } }; static struct vnodeopv_desc umap_vnodeop_opv_desc = diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index 469ae53..f4573bf 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.41 1997/09/07 06:46:34 bde Exp $ + * $Id: union_vnops.c,v 1.42 1997/09/14 02:58:04 peter Exp $ */ #include <sys/param.h> @@ -1755,56 +1755,44 @@ union_strategy(ap) */ vop_t **union_vnodeop_p; static struct vnodeopv_entry_desc union_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)union_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)union_create }, /* create */ - { &vop_whiteout_desc, (vop_t *)union_whiteout }, /* whiteout */ - { &vop_mknod_desc, (vop_t *)union_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)union_open }, /* open */ - { &vop_close_desc, (vop_t *)union_close }, /* close */ - { &vop_access_desc, (vop_t *)union_access }, /* access */ - { &vop_getattr_desc, (vop_t *)union_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)union_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)union_read }, /* read */ - { &vop_write_desc, (vop_t *)union_write }, /* write */ - { &vop_lease_desc, (vop_t *)union_lease }, /* lease */ - { &vop_ioctl_desc, (vop_t *)union_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)union_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)union_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)union_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)union_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)union_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)union_remove }, /* remove */ - { &vop_link_desc, (vop_t *)union_link }, /* link */ - { &vop_rename_desc, (vop_t *)union_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)union_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)union_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)union_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)union_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)union_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)union_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)union_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)union_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)union_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)union_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)union_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)union_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)union_print }, /* print */ - { &vop_islocked_desc, (vop_t *)union_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)union_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)union_advlock }, /* advlock */ -#ifdef notdef - { &vop_blkatoff_desc, (vop_t *)union_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)union_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)union_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)union_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)union_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)union_bwrite }, /* bwrite */ -#endif + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) union_abortop }, + { &vop_access_desc, (vop_t *) union_access }, + { &vop_advlock_desc, (vop_t *) union_advlock }, + { &vop_bmap_desc, (vop_t *) union_bmap }, + { &vop_close_desc, (vop_t *) union_close }, + { &vop_create_desc, (vop_t *) union_create }, + { &vop_fsync_desc, (vop_t *) union_fsync }, + { &vop_getattr_desc, (vop_t *) union_getattr }, + { &vop_inactive_desc, (vop_t *) union_inactive }, + { &vop_ioctl_desc, (vop_t *) union_ioctl }, + { &vop_islocked_desc, (vop_t *) union_islocked }, + { &vop_lease_desc, (vop_t *) union_lease }, + { &vop_link_desc, (vop_t *) union_link }, + { &vop_lock_desc, (vop_t *) union_lock }, + { &vop_lookup_desc, (vop_t *) union_lookup }, + { &vop_mkdir_desc, (vop_t *) union_mkdir }, + { &vop_mknod_desc, (vop_t *) union_mknod }, + { &vop_mmap_desc, (vop_t *) union_mmap }, + { &vop_open_desc, (vop_t *) union_open }, + { &vop_pathconf_desc, (vop_t *) union_pathconf }, + { &vop_poll_desc, (vop_t *) union_poll }, + { &vop_print_desc, (vop_t *) union_print }, + { &vop_read_desc, (vop_t *) union_read }, + { &vop_readdir_desc, (vop_t *) union_readdir }, + { &vop_readlink_desc, (vop_t *) union_readlink }, + { &vop_reclaim_desc, (vop_t *) union_reclaim }, + { &vop_remove_desc, (vop_t *) union_remove }, + { &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 }, + { &vop_unlock_desc, (vop_t *) union_unlock }, + { &vop_whiteout_desc, (vop_t *) union_whiteout }, + { &vop_write_desc, (vop_t *) union_write }, { NULL, NULL } }; static struct vnodeopv_desc union_vnodeop_opv_desc = diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index 8d9bfc5..5938775 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vnops.c,v 1.44 1997/09/14 02:57:44 peter Exp $ */ +/* $Id: msdosfs_vnops.c,v 1.45 1997/09/21 04:23:39 dyson Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */ /*- @@ -1987,54 +1987,44 @@ msdosfs_pathconf(ap) /* Global vfs data structures for msdosfs */ vop_t **msdosfs_vnodeop_p; static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)vfs_cache_lookup }, /* lookup */ - { &vop_cachedlookup_desc, (vop_t *)msdosfs_lookup }, /* lookup */ - { &vop_create_desc, (vop_t *)msdosfs_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)msdosfs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)msdosfs_open }, /* open */ - { &vop_close_desc, (vop_t *)msdosfs_close }, /* close */ - { &vop_access_desc, (vop_t *)msdosfs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)msdosfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)msdosfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)msdosfs_read }, /* read */ - { &vop_write_desc, (vop_t *)msdosfs_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)msdosfs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)msdosfs_poll }, /* poll */ -/* XXX: vop_revoke */ - { &vop_mmap_desc, (vop_t *)msdosfs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)msdosfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)msdosfs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)msdosfs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)msdosfs_link }, /* link */ - { &vop_rename_desc, (vop_t *)msdosfs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)msdosfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)msdosfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)msdosfs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)msdosfs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)msdosfs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)msdosfs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)msdosfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)msdosfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)msdosfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)msdosfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)msdosfs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)msdosfs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)msdosfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)msdosfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)msdosfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)msdosfs_advlock }, /* advlock */ -/* XXX: vop_blkatoff */ -/* XXX: vop_valloc */ - { &vop_reallocblks_desc, (vop_t *)msdosfs_reallocblks }, /* reallocblks */ -/* XXX: vop_vfree */ -/* XXX: vop_truncate */ -/* XXX: vop_update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &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_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_cachedlookup_desc, (vop_t *) msdosfs_lookup }, + { &vop_close_desc, (vop_t *) msdosfs_close }, + { &vop_create_desc, (vop_t *) msdosfs_create }, + { &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 }, + { &vop_unlock_desc, (vop_t *) msdosfs_unlock }, + { &vop_write_desc, (vop_t *) msdosfs_write }, { NULL, NULL } }; static struct vnodeopv_desc msdosfs_vnodeop_opv_desc = diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 86206f9..737971f 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id: nfs_vnops.c,v 1.62 1997/10/05 12:28:59 phk Exp $ + * $Id: nfs_vnops.c,v 1.63 1997/10/15 07:42:31 phk Exp $ */ @@ -135,47 +135,45 @@ static int nfs_bwrite __P((struct vop_bwrite_args *)); */ vop_t **nfsv2_vnodeop_p; static struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)nfs_lookup }, /* lookup */ - { &vop_create_desc, (vop_t *)nfs_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)nfs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)nfs_open }, /* open */ - { &vop_close_desc, (vop_t *)nfs_close }, /* close */ - { &vop_access_desc, (vop_t *)nfs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)nfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)nfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)nfs_read }, /* read */ - { &vop_write_desc, (vop_t *)nfs_write }, /* write */ - { &vop_lease_desc, (vop_t *)nfs_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)nfs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)nfs_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)nfs_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)nfs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)nfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)nfs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)nfs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)nfs_link }, /* link */ - { &vop_rename_desc, (vop_t *)nfs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)nfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)nfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)nfs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)nfs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)nfs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)nfs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)nfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)nfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)nfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)nfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)nfs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)nfs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)nfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)nfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)nfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)nfs_advlock }, /* advlock */ - { &vop_getpages_desc, (vop_t *)nfs_getpages }, /* getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)nfs_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) nfs_abortop }, + { &vop_access_desc, (vop_t *) nfs_access }, + { &vop_advlock_desc, (vop_t *) nfs_advlock }, + { &vop_bmap_desc, (vop_t *) nfs_bmap }, + { &vop_bwrite_desc, (vop_t *) nfs_bwrite }, + { &vop_close_desc, (vop_t *) nfs_close }, + { &vop_create_desc, (vop_t *) nfs_create }, + { &vop_fsync_desc, (vop_t *) nfs_fsync }, + { &vop_getattr_desc, (vop_t *) nfs_getattr }, + { &vop_getpages_desc, (vop_t *) nfs_getpages }, + { &vop_inactive_desc, (vop_t *) nfs_inactive }, + { &vop_ioctl_desc, (vop_t *) nfs_ioctl }, + { &vop_islocked_desc, (vop_t *) nfs_islocked }, + { &vop_lease_desc, (vop_t *) nfs_lease_check }, + { &vop_link_desc, (vop_t *) nfs_link }, + { &vop_lock_desc, (vop_t *) nfs_lock }, + { &vop_lookup_desc, (vop_t *) nfs_lookup }, + { &vop_mkdir_desc, (vop_t *) nfs_mkdir }, + { &vop_mknod_desc, (vop_t *) nfs_mknod }, + { &vop_mmap_desc, (vop_t *) nfs_mmap }, + { &vop_open_desc, (vop_t *) nfs_open }, + { &vop_pathconf_desc, (vop_t *) nfs_pathconf }, + { &vop_poll_desc, (vop_t *) nfs_poll }, + { &vop_print_desc, (vop_t *) nfs_print }, + { &vop_read_desc, (vop_t *) nfs_read }, + { &vop_readdir_desc, (vop_t *) nfs_readdir }, + { &vop_readlink_desc, (vop_t *) nfs_readlink }, + { &vop_reclaim_desc, (vop_t *) nfs_reclaim }, + { &vop_remove_desc, (vop_t *) nfs_remove }, + { &vop_rename_desc, (vop_t *) nfs_rename }, + { &vop_revoke_desc, (vop_t *) nfs_revoke }, + { &vop_rmdir_desc, (vop_t *) nfs_rmdir }, + { &vop_seek_desc, (vop_t *) nfs_seek }, + { &vop_setattr_desc, (vop_t *) nfs_setattr }, + { &vop_strategy_desc, (vop_t *) nfs_strategy }, + { &vop_symlink_desc, (vop_t *) nfs_symlink }, + { &vop_unlock_desc, (vop_t *) nfs_unlock }, + { &vop_write_desc, (vop_t *) nfs_write }, { NULL, NULL } }; static struct vnodeopv_desc nfsv2_vnodeop_opv_desc = @@ -187,48 +185,44 @@ VNODEOP_SET(nfsv2_vnodeop_opv_desc); */ vop_t **spec_nfsv2nodeop_p; static struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)nfsspec_close }, /* close */ - { &vop_access_desc, (vop_t *)nfsspec_access }, /* access */ - { &vop_getattr_desc, (vop_t *)nfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)nfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)nfsspec_read }, /* read */ - { &vop_write_desc, (vop_t *)nfsspec_write }, /* write */ - { &vop_lease_desc, (vop_t *)spec_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)spec_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)nfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)nfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)nfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)nfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)nfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)nfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)nfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ -/* XXX: vop_getpages - XXX: call spec_getpages here? */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) nfsspec_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) nfsspec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) nfs_fsync }, + { &vop_getattr_desc, (vop_t *) nfs_getattr }, + { &vop_inactive_desc, (vop_t *) nfs_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) nfs_islocked }, + { &vop_lease_desc, (vop_t *) spec_lease_check }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) nfs_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) nfs_print }, + { &vop_read_desc, (vop_t *) nfsspec_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reclaim_desc, (vop_t *) nfs_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_revoke_desc, (vop_t *) spec_revoke }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) nfs_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) spec_symlink }, + { &vop_unlock_desc, (vop_t *) nfs_unlock }, + { &vop_write_desc, (vop_t *) nfsspec_write }, { NULL, NULL } }; static struct vnodeopv_desc spec_nfsv2nodeop_opv_desc = @@ -237,48 +231,44 @@ VNODEOP_SET(spec_nfsv2nodeop_opv_desc); vop_t **fifo_nfsv2nodeop_p; static struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fifo_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fifo_open }, /* open */ - { &vop_close_desc, (vop_t *)nfsfifo_close }, /* close */ - { &vop_access_desc, (vop_t *)nfsspec_access }, /* access */ - { &vop_getattr_desc, (vop_t *)nfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)nfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)nfsfifo_read }, /* read */ - { &vop_write_desc, (vop_t *)nfsfifo_write }, /* write */ - { &vop_lease_desc, (vop_t *)fifo_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)fifo_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)nfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fifo_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fifo_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fifo_link }, /* link */ - { &vop_rename_desc, (vop_t *)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)nfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)nfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)nfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)nfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fifo_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)nfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)nfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fifo_abortop }, + { &vop_access_desc, (vop_t *) nfsspec_access }, + { &vop_advlock_desc, (vop_t *) fifo_advlock }, + { &vop_bmap_desc, (vop_t *) fifo_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) nfsfifo_close }, + { &vop_create_desc, (vop_t *) fifo_create }, + { &vop_fsync_desc, (vop_t *) nfs_fsync }, + { &vop_getattr_desc, (vop_t *) nfs_getattr }, + { &vop_inactive_desc, (vop_t *) nfs_inactive }, + { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, + { &vop_islocked_desc, (vop_t *) nfs_islocked }, + { &vop_lease_desc, (vop_t *) fifo_lease_check }, + { &vop_link_desc, (vop_t *) fifo_link }, + { &vop_lock_desc, (vop_t *) nfs_lock }, + { &vop_lookup_desc, (vop_t *) fifo_lookup }, + { &vop_mkdir_desc, (vop_t *) fifo_mkdir }, + { &vop_mknod_desc, (vop_t *) fifo_mknod }, + { &vop_mmap_desc, (vop_t *) fifo_mmap }, + { &vop_open_desc, (vop_t *) fifo_open }, + { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_poll_desc, (vop_t *) fifo_poll }, + { &vop_print_desc, (vop_t *) nfs_print }, + { &vop_read_desc, (vop_t *) nfsfifo_read }, + { &vop_readdir_desc, (vop_t *) fifo_readdir }, + { &vop_readlink_desc, (vop_t *) fifo_readlink }, + { &vop_reclaim_desc, (vop_t *) nfs_reclaim }, + { &vop_remove_desc, (vop_t *) fifo_remove }, + { &vop_rename_desc, (vop_t *) fifo_rename }, + { &vop_revoke_desc, (vop_t *) fifo_revoke }, + { &vop_rmdir_desc, (vop_t *) fifo_rmdir }, + { &vop_seek_desc, (vop_t *) fifo_seek }, + { &vop_setattr_desc, (vop_t *) nfs_setattr }, + { &vop_strategy_desc, (vop_t *) fifo_strategy }, + { &vop_symlink_desc, (vop_t *) fifo_symlink }, + { &vop_unlock_desc, (vop_t *) nfs_unlock }, + { &vop_write_desc, (vop_t *) nfsfifo_write }, { NULL, NULL } }; static struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc = diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 86206f9..737971f 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id: nfs_vnops.c,v 1.62 1997/10/05 12:28:59 phk Exp $ + * $Id: nfs_vnops.c,v 1.63 1997/10/15 07:42:31 phk Exp $ */ @@ -135,47 +135,45 @@ static int nfs_bwrite __P((struct vop_bwrite_args *)); */ vop_t **nfsv2_vnodeop_p; static struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)nfs_lookup }, /* lookup */ - { &vop_create_desc, (vop_t *)nfs_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)nfs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)nfs_open }, /* open */ - { &vop_close_desc, (vop_t *)nfs_close }, /* close */ - { &vop_access_desc, (vop_t *)nfs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)nfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)nfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)nfs_read }, /* read */ - { &vop_write_desc, (vop_t *)nfs_write }, /* write */ - { &vop_lease_desc, (vop_t *)nfs_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)nfs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)nfs_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)nfs_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)nfs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)nfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)nfs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)nfs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)nfs_link }, /* link */ - { &vop_rename_desc, (vop_t *)nfs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)nfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)nfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)nfs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)nfs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)nfs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)nfs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)nfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)nfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)nfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)nfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)nfs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)nfs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)nfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)nfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)nfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)nfs_advlock }, /* advlock */ - { &vop_getpages_desc, (vop_t *)nfs_getpages }, /* getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)nfs_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) nfs_abortop }, + { &vop_access_desc, (vop_t *) nfs_access }, + { &vop_advlock_desc, (vop_t *) nfs_advlock }, + { &vop_bmap_desc, (vop_t *) nfs_bmap }, + { &vop_bwrite_desc, (vop_t *) nfs_bwrite }, + { &vop_close_desc, (vop_t *) nfs_close }, + { &vop_create_desc, (vop_t *) nfs_create }, + { &vop_fsync_desc, (vop_t *) nfs_fsync }, + { &vop_getattr_desc, (vop_t *) nfs_getattr }, + { &vop_getpages_desc, (vop_t *) nfs_getpages }, + { &vop_inactive_desc, (vop_t *) nfs_inactive }, + { &vop_ioctl_desc, (vop_t *) nfs_ioctl }, + { &vop_islocked_desc, (vop_t *) nfs_islocked }, + { &vop_lease_desc, (vop_t *) nfs_lease_check }, + { &vop_link_desc, (vop_t *) nfs_link }, + { &vop_lock_desc, (vop_t *) nfs_lock }, + { &vop_lookup_desc, (vop_t *) nfs_lookup }, + { &vop_mkdir_desc, (vop_t *) nfs_mkdir }, + { &vop_mknod_desc, (vop_t *) nfs_mknod }, + { &vop_mmap_desc, (vop_t *) nfs_mmap }, + { &vop_open_desc, (vop_t *) nfs_open }, + { &vop_pathconf_desc, (vop_t *) nfs_pathconf }, + { &vop_poll_desc, (vop_t *) nfs_poll }, + { &vop_print_desc, (vop_t *) nfs_print }, + { &vop_read_desc, (vop_t *) nfs_read }, + { &vop_readdir_desc, (vop_t *) nfs_readdir }, + { &vop_readlink_desc, (vop_t *) nfs_readlink }, + { &vop_reclaim_desc, (vop_t *) nfs_reclaim }, + { &vop_remove_desc, (vop_t *) nfs_remove }, + { &vop_rename_desc, (vop_t *) nfs_rename }, + { &vop_revoke_desc, (vop_t *) nfs_revoke }, + { &vop_rmdir_desc, (vop_t *) nfs_rmdir }, + { &vop_seek_desc, (vop_t *) nfs_seek }, + { &vop_setattr_desc, (vop_t *) nfs_setattr }, + { &vop_strategy_desc, (vop_t *) nfs_strategy }, + { &vop_symlink_desc, (vop_t *) nfs_symlink }, + { &vop_unlock_desc, (vop_t *) nfs_unlock }, + { &vop_write_desc, (vop_t *) nfs_write }, { NULL, NULL } }; static struct vnodeopv_desc nfsv2_vnodeop_opv_desc = @@ -187,48 +185,44 @@ VNODEOP_SET(nfsv2_vnodeop_opv_desc); */ vop_t **spec_nfsv2nodeop_p; static struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)nfsspec_close }, /* close */ - { &vop_access_desc, (vop_t *)nfsspec_access }, /* access */ - { &vop_getattr_desc, (vop_t *)nfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)nfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)nfsspec_read }, /* read */ - { &vop_write_desc, (vop_t *)nfsspec_write }, /* write */ - { &vop_lease_desc, (vop_t *)spec_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)spec_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)nfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)nfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)nfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)nfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)nfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)nfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)nfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ -/* XXX: vop_getpages - XXX: call spec_getpages here? */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) nfsspec_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) nfsspec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) nfs_fsync }, + { &vop_getattr_desc, (vop_t *) nfs_getattr }, + { &vop_inactive_desc, (vop_t *) nfs_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) nfs_islocked }, + { &vop_lease_desc, (vop_t *) spec_lease_check }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) nfs_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) nfs_print }, + { &vop_read_desc, (vop_t *) nfsspec_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reclaim_desc, (vop_t *) nfs_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_revoke_desc, (vop_t *) spec_revoke }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) nfs_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) spec_symlink }, + { &vop_unlock_desc, (vop_t *) nfs_unlock }, + { &vop_write_desc, (vop_t *) nfsspec_write }, { NULL, NULL } }; static struct vnodeopv_desc spec_nfsv2nodeop_opv_desc = @@ -237,48 +231,44 @@ VNODEOP_SET(spec_nfsv2nodeop_opv_desc); vop_t **fifo_nfsv2nodeop_p; static struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fifo_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fifo_open }, /* open */ - { &vop_close_desc, (vop_t *)nfsfifo_close }, /* close */ - { &vop_access_desc, (vop_t *)nfsspec_access }, /* access */ - { &vop_getattr_desc, (vop_t *)nfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)nfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)nfsfifo_read }, /* read */ - { &vop_write_desc, (vop_t *)nfsfifo_write }, /* write */ - { &vop_lease_desc, (vop_t *)fifo_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)fifo_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)nfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fifo_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fifo_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fifo_link }, /* link */ - { &vop_rename_desc, (vop_t *)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)nfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)nfs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)nfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)nfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fifo_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)nfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)nfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fifo_abortop }, + { &vop_access_desc, (vop_t *) nfsspec_access }, + { &vop_advlock_desc, (vop_t *) fifo_advlock }, + { &vop_bmap_desc, (vop_t *) fifo_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) nfsfifo_close }, + { &vop_create_desc, (vop_t *) fifo_create }, + { &vop_fsync_desc, (vop_t *) nfs_fsync }, + { &vop_getattr_desc, (vop_t *) nfs_getattr }, + { &vop_inactive_desc, (vop_t *) nfs_inactive }, + { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, + { &vop_islocked_desc, (vop_t *) nfs_islocked }, + { &vop_lease_desc, (vop_t *) fifo_lease_check }, + { &vop_link_desc, (vop_t *) fifo_link }, + { &vop_lock_desc, (vop_t *) nfs_lock }, + { &vop_lookup_desc, (vop_t *) fifo_lookup }, + { &vop_mkdir_desc, (vop_t *) fifo_mkdir }, + { &vop_mknod_desc, (vop_t *) fifo_mknod }, + { &vop_mmap_desc, (vop_t *) fifo_mmap }, + { &vop_open_desc, (vop_t *) fifo_open }, + { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_poll_desc, (vop_t *) fifo_poll }, + { &vop_print_desc, (vop_t *) nfs_print }, + { &vop_read_desc, (vop_t *) nfsfifo_read }, + { &vop_readdir_desc, (vop_t *) fifo_readdir }, + { &vop_readlink_desc, (vop_t *) fifo_readlink }, + { &vop_reclaim_desc, (vop_t *) nfs_reclaim }, + { &vop_remove_desc, (vop_t *) fifo_remove }, + { &vop_rename_desc, (vop_t *) fifo_rename }, + { &vop_revoke_desc, (vop_t *) fifo_revoke }, + { &vop_rmdir_desc, (vop_t *) fifo_rmdir }, + { &vop_seek_desc, (vop_t *) fifo_seek }, + { &vop_setattr_desc, (vop_t *) nfs_setattr }, + { &vop_strategy_desc, (vop_t *) fifo_strategy }, + { &vop_symlink_desc, (vop_t *) fifo_symlink }, + { &vop_unlock_desc, (vop_t *) nfs_unlock }, + { &vop_write_desc, (vop_t *) nfsfifo_write }, { NULL, NULL } }; static struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc = diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 5db2c63..693ac3b 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95 - * $Id: ffs_vnops.c,v 1.30 1997/09/27 13:40:10 kato Exp $ + * $Id: ffs_vnops.c,v 1.31 1997/10/10 18:17:00 phk Exp $ */ #include <sys/param.h> @@ -72,54 +72,53 @@ static int ffs_write __P((struct vop_write_args *)); /* Global vfs data structures for ufs. */ vop_t **ffs_vnodeop_p; static struct vnodeopv_entry_desc ffs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)vfs_cache_lookup },/* lookup */ - { &vop_cachedlookup_desc, (vop_t *)ufs_lookup },/* cachedlookup */ - { &vop_create_desc, (vop_t *)ufs_create }, /* create */ - { &vop_whiteout_desc, (vop_t *)ufs_whiteout }, /* whiteout */ - { &vop_mknod_desc, (vop_t *)ufs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)ufs_open }, /* open */ - { &vop_close_desc, (vop_t *)ufs_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ffs_read }, /* read */ - { &vop_write_desc, (vop_t *)ffs_write }, /* write */ - { &vop_lease_desc, (vop_t *)ufs_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)ufs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)ufs_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)ufs_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)ufs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)ffs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)ufs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)ufs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)ufs_link }, /* link */ - { &vop_rename_desc, (vop_t *)ufs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)ufs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)ufs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)ufs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)ufs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)ufs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)ufs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ufs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)ufs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)ufs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)ufs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)ufs_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)ffs_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)ffs_valloc }, /* valloc */ - { &vop_reallocblks_desc, (vop_t *)ffs_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (vop_t *)ffs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)ffs_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)ffs_update }, /* update */ - { &vop_getpages_desc, (vop_t *)ffs_getpages}, /* getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) ufs_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) ufs_advlock }, + { &vop_blkatoff_desc, (vop_t *) ffs_blkatoff }, + { &vop_bmap_desc, (vop_t *) ufs_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_cachedlookup_desc, (vop_t *) ufs_lookup }, + { &vop_close_desc, (vop_t *) ufs_close }, + { &vop_create_desc, (vop_t *) ufs_create }, + { &vop_fsync_desc, (vop_t *) ffs_fsync }, + { &vop_getattr_desc, (vop_t *) ufs_getattr }, + { &vop_getpages_desc, (vop_t *) ffs_getpages }, + { &vop_inactive_desc, (vop_t *) ufs_inactive }, + { &vop_ioctl_desc, (vop_t *) ufs_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_lease_desc, (vop_t *) ufs_lease_check }, + { &vop_link_desc, (vop_t *) ufs_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) vfs_cache_lookup }, + { &vop_mkdir_desc, (vop_t *) ufs_mkdir }, + { &vop_mknod_desc, (vop_t *) ufs_mknod }, + { &vop_mmap_desc, (vop_t *) ufs_mmap }, + { &vop_open_desc, (vop_t *) ufs_open }, + { &vop_pathconf_desc, (vop_t *) ufs_pathconf }, + { &vop_poll_desc, (vop_t *) ufs_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ffs_read }, + { &vop_readdir_desc, (vop_t *) ufs_readdir }, + { &vop_readlink_desc, (vop_t *) ufs_readlink }, + { &vop_reallocblks_desc, (vop_t *) ffs_reallocblks }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) ufs_remove }, + { &vop_rename_desc, (vop_t *) ufs_rename }, + { &vop_revoke_desc, (vop_t *) ufs_revoke }, + { &vop_rmdir_desc, (vop_t *) ufs_rmdir }, + { &vop_seek_desc, (vop_t *) ufs_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) ufs_strategy }, + { &vop_symlink_desc, (vop_t *) ufs_symlink }, + { &vop_truncate_desc, (vop_t *) ffs_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) ffs_update }, + { &vop_valloc_desc, (vop_t *) ffs_valloc }, + { &vop_vfree_desc, (vop_t *) ffs_vfree }, + { &vop_whiteout_desc, (vop_t *) ufs_whiteout }, + { &vop_write_desc, (vop_t *) ffs_write }, { NULL, NULL } }; static struct vnodeopv_desc ffs_vnodeop_opv_desc = @@ -127,54 +126,51 @@ static struct vnodeopv_desc ffs_vnodeop_opv_desc = vop_t **ffs_specop_p; static struct vnodeopv_entry_desc ffs_specop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)ufsspec_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ufsspec_read }, /* read */ - { &vop_write_desc, (vop_t *)ufsspec_write }, /* write */ - { &vop_lease_desc, (vop_t *)spec_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)spec_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)ffs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ufs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)spec_valloc }, /* valloc */ - { &vop_reallocblks_desc, (vop_t *)spec_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (vop_t *)ffs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)ffs_update }, /* update */ - { &vop_getpages_desc, (vop_t *)spec_getpages}, /* getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_blkatoff_desc, (vop_t *) spec_blkatoff }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) ufsspec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) ffs_fsync }, + { &vop_getattr_desc, (vop_t *) ufs_getattr }, + { &vop_getpages_desc, (vop_t *) spec_getpages }, + { &vop_inactive_desc, (vop_t *) ufs_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_lease_desc, (vop_t *) spec_lease_check }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ufsspec_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reallocblks_desc, (vop_t *) spec_reallocblks }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_revoke_desc, (vop_t *) spec_revoke }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) spec_symlink }, + { &vop_truncate_desc, (vop_t *) spec_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) ffs_update }, + { &vop_valloc_desc, (vop_t *) spec_valloc }, + { &vop_vfree_desc, (vop_t *) ffs_vfree }, + { &vop_write_desc, (vop_t *) ufsspec_write }, { NULL, NULL } }; static struct vnodeopv_desc ffs_specop_opv_desc = @@ -182,54 +178,50 @@ static struct vnodeopv_desc ffs_specop_opv_desc = vop_t **ffs_fifoop_p; static struct vnodeopv_entry_desc ffs_fifoop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fifo_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fifo_open }, /* open */ - { &vop_close_desc, (vop_t *)ufsfifo_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)ufs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ufsfifo_read }, /* read */ - { &vop_write_desc, (vop_t *)ufsfifo_write }, /* write */ - { &vop_lease_desc, (vop_t *)fifo_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)fifo_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)ffs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fifo_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fifo_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fifo_link }, /* link */ - { &vop_rename_desc, (vop_t *)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ufs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fifo_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)fifo_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)fifo_valloc }, /* valloc */ - { &vop_reallocblks_desc, (vop_t *)fifo_reallocblks }, /* reallocblks */ - { &vop_vfree_desc, (vop_t *)ffs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)fifo_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)ffs_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fifo_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) fifo_advlock }, + { &vop_blkatoff_desc, (vop_t *) fifo_blkatoff }, + { &vop_bmap_desc, (vop_t *) fifo_bmap }, + { &vop_bwrite_desc, (vop_t *) vn_bwrite }, + { &vop_close_desc, (vop_t *) ufsfifo_close }, + { &vop_create_desc, (vop_t *) fifo_create }, + { &vop_fsync_desc, (vop_t *) ffs_fsync }, + { &vop_getattr_desc, (vop_t *) ufs_getattr }, + { &vop_inactive_desc, (vop_t *) ufs_inactive }, + { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_lease_desc, (vop_t *) fifo_lease_check }, + { &vop_link_desc, (vop_t *) fifo_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) fifo_lookup }, + { &vop_mkdir_desc, (vop_t *) fifo_mkdir }, + { &vop_mknod_desc, (vop_t *) fifo_mknod }, + { &vop_mmap_desc, (vop_t *) fifo_mmap }, + { &vop_open_desc, (vop_t *) fifo_open }, + { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_poll_desc, (vop_t *) fifo_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ufsfifo_read }, + { &vop_readdir_desc, (vop_t *) fifo_readdir }, + { &vop_readlink_desc, (vop_t *) fifo_readlink }, + { &vop_reallocblks_desc, (vop_t *) fifo_reallocblks }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) fifo_remove }, + { &vop_rename_desc, (vop_t *) fifo_rename }, + { &vop_revoke_desc, (vop_t *) fifo_revoke }, + { &vop_rmdir_desc, (vop_t *) fifo_rmdir }, + { &vop_seek_desc, (vop_t *) fifo_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) fifo_strategy }, + { &vop_symlink_desc, (vop_t *) fifo_symlink }, + { &vop_truncate_desc, (vop_t *) fifo_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) ffs_update }, + { &vop_valloc_desc, (vop_t *) fifo_valloc }, + { &vop_vfree_desc, (vop_t *) ffs_vfree }, + { &vop_write_desc, (vop_t *) ufsfifo_write }, { NULL, NULL } }; static struct vnodeopv_desc ffs_fifoop_opv_desc = diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index 968a71f..01d32e7 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_vnops.c 8.13 (Berkeley) 6/10/95 - * $Id: lfs_vnops.c,v 1.23 1997/09/14 02:58:06 peter Exp $ + * $Id: lfs_vnops.c,v 1.24 1997/10/10 18:17:22 phk Exp $ */ #include <sys/param.h> @@ -72,54 +72,50 @@ static int lfs_write __P((struct vop_write_args *)); /* Global vfs data structures for lfs. */ vop_t **lfs_vnodeop_p; static struct vnodeopv_entry_desc lfs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)ufs_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)ufs_create }, /* create */ - { &vop_whiteout_desc, (vop_t *)ufs_whiteout }, /* whiteout */ - { &vop_mknod_desc, (vop_t *)ufs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)ufs_open }, /* open */ - { &vop_close_desc, (vop_t *)lfs_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)lfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)lfs_read }, /* read */ - { &vop_write_desc, (vop_t *)lfs_write }, /* write */ - { &vop_lease_desc, (vop_t *)ufs_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)ufs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)ufs_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)ufs_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)ufs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)lfs_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)ufs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)ufs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)ufs_link }, /* link */ - { &vop_rename_desc, (vop_t *)ufs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)ufs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)ufs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)ufs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)ufs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)ufs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)ufs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ufs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)ufs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)ufs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)ufs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)ufs_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)lfs_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)lfs_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)lfs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)lfs_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)lfs_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)lfs_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) ufs_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) ufs_advlock }, + { &vop_blkatoff_desc, (vop_t *) lfs_blkatoff }, + { &vop_bmap_desc, (vop_t *) ufs_bmap }, + { &vop_bwrite_desc, (vop_t *) lfs_bwrite }, + { &vop_close_desc, (vop_t *) lfs_close }, + { &vop_create_desc, (vop_t *) ufs_create }, + { &vop_fsync_desc, (vop_t *) lfs_fsync }, + { &vop_getattr_desc, (vop_t *) lfs_getattr }, + { &vop_inactive_desc, (vop_t *) ufs_inactive }, + { &vop_ioctl_desc, (vop_t *) ufs_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_lease_desc, (vop_t *) ufs_lease_check }, + { &vop_link_desc, (vop_t *) ufs_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) ufs_lookup }, + { &vop_mkdir_desc, (vop_t *) ufs_mkdir }, + { &vop_mknod_desc, (vop_t *) ufs_mknod }, + { &vop_mmap_desc, (vop_t *) ufs_mmap }, + { &vop_open_desc, (vop_t *) ufs_open }, + { &vop_pathconf_desc, (vop_t *) ufs_pathconf }, + { &vop_poll_desc, (vop_t *) ufs_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) lfs_read }, + { &vop_readdir_desc, (vop_t *) ufs_readdir }, + { &vop_readlink_desc, (vop_t *) ufs_readlink }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) ufs_remove }, + { &vop_rename_desc, (vop_t *) ufs_rename }, + { &vop_revoke_desc, (vop_t *) ufs_revoke }, + { &vop_rmdir_desc, (vop_t *) ufs_rmdir }, + { &vop_seek_desc, (vop_t *) ufs_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) ufs_strategy }, + { &vop_symlink_desc, (vop_t *) ufs_symlink }, + { &vop_truncate_desc, (vop_t *) lfs_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) lfs_update }, + { &vop_valloc_desc, (vop_t *) lfs_valloc }, + { &vop_vfree_desc, (vop_t *) lfs_vfree }, + { &vop_whiteout_desc, (vop_t *) ufs_whiteout }, + { &vop_write_desc, (vop_t *) lfs_write }, { NULL, NULL } }; static struct vnodeopv_desc lfs_vnodeop_opv_desc = @@ -127,54 +123,49 @@ static struct vnodeopv_desc lfs_vnodeop_opv_desc = vop_t **lfs_specop_p; static struct vnodeopv_entry_desc lfs_specop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)spec_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)spec_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)spec_open }, /* open */ - { &vop_close_desc, (vop_t *)ufsspec_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)lfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ufsspec_read }, /* read */ - { &vop_write_desc, (vop_t *)ufsspec_write }, /* write */ - { &vop_lease_desc, (vop_t *)spec_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)spec_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)spec_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)spec_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)spec_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)spec_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)spec_remove }, /* remove */ - { &vop_link_desc, (vop_t *)spec_link }, /* link */ - { &vop_rename_desc, (vop_t *)spec_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)spec_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)spec_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)spec_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)spec_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ufs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)spec_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)spec_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)spec_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)lfs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)spec_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)lfs_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)lfs_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) spec_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) spec_advlock }, + { &vop_blkatoff_desc, (vop_t *) spec_blkatoff }, + { &vop_bmap_desc, (vop_t *) spec_bmap }, + { &vop_bwrite_desc, (vop_t *) lfs_bwrite }, + { &vop_close_desc, (vop_t *) ufsspec_close }, + { &vop_create_desc, (vop_t *) spec_create }, + { &vop_fsync_desc, (vop_t *) spec_fsync }, + { &vop_getattr_desc, (vop_t *) lfs_getattr }, + { &vop_inactive_desc, (vop_t *) ufs_inactive }, + { &vop_ioctl_desc, (vop_t *) spec_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_lease_desc, (vop_t *) spec_lease_check }, + { &vop_link_desc, (vop_t *) spec_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) spec_lookup }, + { &vop_mkdir_desc, (vop_t *) spec_mkdir }, + { &vop_mknod_desc, (vop_t *) spec_mknod }, + { &vop_mmap_desc, (vop_t *) spec_mmap }, + { &vop_open_desc, (vop_t *) spec_open }, + { &vop_pathconf_desc, (vop_t *) spec_pathconf }, + { &vop_poll_desc, (vop_t *) spec_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ufsspec_read }, + { &vop_readdir_desc, (vop_t *) spec_readdir }, + { &vop_readlink_desc, (vop_t *) spec_readlink }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) spec_remove }, + { &vop_rename_desc, (vop_t *) spec_rename }, + { &vop_revoke_desc, (vop_t *) spec_revoke }, + { &vop_rmdir_desc, (vop_t *) spec_rmdir }, + { &vop_seek_desc, (vop_t *) spec_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) spec_strategy }, + { &vop_symlink_desc, (vop_t *) spec_symlink }, + { &vop_truncate_desc, (vop_t *) spec_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) lfs_update }, + { &vop_valloc_desc, (vop_t *) spec_valloc }, + { &vop_vfree_desc, (vop_t *) lfs_vfree }, + { &vop_write_desc, (vop_t *) ufsspec_write }, { NULL, NULL } }; static struct vnodeopv_desc lfs_specop_opv_desc = @@ -182,54 +173,49 @@ static struct vnodeopv_desc lfs_specop_opv_desc = vop_t **lfs_fifoop_p; static struct vnodeopv_entry_desc lfs_fifoop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)fifo_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)fifo_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)fifo_open }, /* open */ - { &vop_close_desc, (vop_t *)ufsfifo_close }, /* close */ - { &vop_access_desc, (vop_t *)ufs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)lfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)ufs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)ufsfifo_read }, /* read */ - { &vop_write_desc, (vop_t *)ufsfifo_write }, /* write */ - { &vop_lease_desc, (vop_t *)fifo_lease_check }, /* lease */ - { &vop_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)fifo_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)fifo_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)fifo_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)fifo_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)fifo_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)fifo_remove }, /* remove */ - { &vop_link_desc, (vop_t *)fifo_link }, /* link */ - { &vop_rename_desc, (vop_t *)fifo_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)fifo_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)fifo_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)fifo_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)fifo_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)ufs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)ufs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)ufs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)fifo_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)fifo_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)ufs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)ufs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)fifo_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)fifo_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)fifo_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)lfs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)fifo_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)lfs_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)lfs_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) fifo_abortop }, + { &vop_access_desc, (vop_t *) ufs_access }, + { &vop_advlock_desc, (vop_t *) fifo_advlock }, + { &vop_blkatoff_desc, (vop_t *) fifo_blkatoff }, + { &vop_bmap_desc, (vop_t *) fifo_bmap }, + { &vop_bwrite_desc, (vop_t *) lfs_bwrite }, + { &vop_close_desc, (vop_t *) ufsfifo_close }, + { &vop_create_desc, (vop_t *) fifo_create }, + { &vop_fsync_desc, (vop_t *) fifo_fsync }, + { &vop_getattr_desc, (vop_t *) lfs_getattr }, + { &vop_inactive_desc, (vop_t *) ufs_inactive }, + { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, + { &vop_islocked_desc, (vop_t *) ufs_islocked }, + { &vop_lease_desc, (vop_t *) fifo_lease_check }, + { &vop_link_desc, (vop_t *) fifo_link }, + { &vop_lock_desc, (vop_t *) ufs_lock }, + { &vop_lookup_desc, (vop_t *) fifo_lookup }, + { &vop_mkdir_desc, (vop_t *) fifo_mkdir }, + { &vop_mknod_desc, (vop_t *) fifo_mknod }, + { &vop_mmap_desc, (vop_t *) fifo_mmap }, + { &vop_open_desc, (vop_t *) fifo_open }, + { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, + { &vop_poll_desc, (vop_t *) fifo_poll }, + { &vop_print_desc, (vop_t *) ufs_print }, + { &vop_read_desc, (vop_t *) ufsfifo_read }, + { &vop_readdir_desc, (vop_t *) fifo_readdir }, + { &vop_readlink_desc, (vop_t *) fifo_readlink }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) fifo_remove }, + { &vop_rename_desc, (vop_t *) fifo_rename }, + { &vop_revoke_desc, (vop_t *) fifo_revoke }, + { &vop_rmdir_desc, (vop_t *) fifo_rmdir }, + { &vop_seek_desc, (vop_t *) fifo_seek }, + { &vop_setattr_desc, (vop_t *) ufs_setattr }, + { &vop_strategy_desc, (vop_t *) fifo_strategy }, + { &vop_symlink_desc, (vop_t *) fifo_symlink }, + { &vop_truncate_desc, (vop_t *) fifo_truncate }, + { &vop_unlock_desc, (vop_t *) ufs_unlock }, + { &vop_update_desc, (vop_t *) lfs_update }, + { &vop_valloc_desc, (vop_t *) fifo_valloc }, + { &vop_vfree_desc, (vop_t *) lfs_vfree }, + { &vop_write_desc, (vop_t *) ufsfifo_write }, { NULL, NULL } }; static struct vnodeopv_desc lfs_fifoop_opv_desc = diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index 10e57ee..71c799f 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vnops.c 8.11 (Berkeley) 5/22/95 - * $Id: mfs_vnops.c,v 1.20 1997/09/21 22:10:02 gibbs Exp $ + * $Id: mfs_vnops.c,v 1.21 1997/10/10 18:17:42 phk Exp $ */ #include <sys/param.h> @@ -65,54 +65,48 @@ static int mfs_strategy __P((struct vop_strategy_args *)); /* XXX */ */ vop_t **mfs_vnodeop_p; static struct vnodeopv_entry_desc mfs_vnodeop_entries[] = { - { &vop_default_desc, (vop_t *)vn_default_error }, - { &vop_lookup_desc, (vop_t *)mfs_lookup }, /* lookup */ -/* XXX: vop_cachedlookup */ - { &vop_create_desc, (vop_t *)mfs_create }, /* create */ -/* XXX: vop_whiteout */ - { &vop_mknod_desc, (vop_t *)mfs_mknod }, /* mknod */ - { &vop_open_desc, (vop_t *)mfs_open }, /* open */ - { &vop_close_desc, (vop_t *)mfs_close }, /* close */ - { &vop_access_desc, (vop_t *)mfs_access }, /* access */ - { &vop_getattr_desc, (vop_t *)mfs_getattr }, /* getattr */ - { &vop_setattr_desc, (vop_t *)mfs_setattr }, /* setattr */ - { &vop_read_desc, (vop_t *)mfs_read }, /* read */ - { &vop_write_desc, (vop_t *)mfs_write }, /* write */ -/* XXX: vop_lease */ - { &vop_ioctl_desc, (vop_t *)mfs_ioctl }, /* ioctl */ - { &vop_poll_desc, (vop_t *)mfs_poll }, /* poll */ - { &vop_revoke_desc, (vop_t *)mfs_revoke }, /* revoke */ - { &vop_mmap_desc, (vop_t *)mfs_mmap }, /* mmap */ - { &vop_fsync_desc, (vop_t *)spec_fsync }, /* fsync */ - { &vop_seek_desc, (vop_t *)mfs_seek }, /* seek */ - { &vop_remove_desc, (vop_t *)mfs_remove }, /* remove */ - { &vop_link_desc, (vop_t *)mfs_link }, /* link */ - { &vop_rename_desc, (vop_t *)mfs_rename }, /* rename */ - { &vop_mkdir_desc, (vop_t *)mfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, (vop_t *)mfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, (vop_t *)mfs_symlink }, /* symlink */ - { &vop_readdir_desc, (vop_t *)mfs_readdir }, /* readdir */ - { &vop_readlink_desc, (vop_t *)mfs_readlink }, /* readlink */ - { &vop_abortop_desc, (vop_t *)mfs_abortop }, /* abortop */ - { &vop_inactive_desc, (vop_t *)mfs_inactive }, /* inactive */ - { &vop_reclaim_desc, (vop_t *)ufs_reclaim }, /* reclaim */ - { &vop_lock_desc, (vop_t *)mfs_lock }, /* lock */ - { &vop_unlock_desc, (vop_t *)mfs_unlock }, /* unlock */ - { &vop_bmap_desc, (vop_t *)mfs_bmap }, /* bmap */ - { &vop_strategy_desc, (vop_t *)mfs_strategy }, /* strategy */ - { &vop_print_desc, (vop_t *)mfs_print }, /* print */ - { &vop_islocked_desc, (vop_t *)mfs_islocked }, /* islocked */ - { &vop_pathconf_desc, (vop_t *)mfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, (vop_t *)mfs_advlock }, /* advlock */ - { &vop_blkatoff_desc, (vop_t *)mfs_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, (vop_t *)mfs_valloc }, /* valloc */ -/* XXX: vop_reallocblks */ - { &vop_vfree_desc, (vop_t *)mfs_vfree }, /* vfree */ - { &vop_truncate_desc, (vop_t *)mfs_truncate }, /* truncate */ - { &vop_update_desc, (vop_t *)mfs_update }, /* update */ -/* XXX: vop_getpages */ -/* XXX: vop_putpages */ - { &vop_bwrite_desc, (vop_t *)mfs_bwrite }, /* bwrite */ + { &vop_default_desc, (vop_t *) vn_default_error }, + { &vop_abortop_desc, (vop_t *) mfs_abortop }, + { &vop_access_desc, (vop_t *) mfs_access }, + { &vop_advlock_desc, (vop_t *) mfs_advlock }, + { &vop_blkatoff_desc, (vop_t *) mfs_blkatoff }, + { &vop_bmap_desc, (vop_t *) mfs_bmap }, + { &vop_bwrite_desc, (vop_t *) mfs_bwrite }, + { &vop_close_desc, (vop_t *) mfs_close }, + { &vop_create_desc, (vop_t *) mfs_create }, + { &vop_fsync_desc, (vop_t *) spec_fsync }, + { &vop_getattr_desc, (vop_t *) mfs_getattr }, + { &vop_inactive_desc, (vop_t *) mfs_inactive }, + { &vop_ioctl_desc, (vop_t *) mfs_ioctl }, + { &vop_islocked_desc, (vop_t *) mfs_islocked }, + { &vop_link_desc, (vop_t *) mfs_link }, + { &vop_lock_desc, (vop_t *) mfs_lock }, + { &vop_lookup_desc, (vop_t *) mfs_lookup }, + { &vop_mkdir_desc, (vop_t *) mfs_mkdir }, + { &vop_mknod_desc, (vop_t *) mfs_mknod }, + { &vop_mmap_desc, (vop_t *) mfs_mmap }, + { &vop_open_desc, (vop_t *) mfs_open }, + { &vop_pathconf_desc, (vop_t *) mfs_pathconf }, + { &vop_poll_desc, (vop_t *) mfs_poll }, + { &vop_print_desc, (vop_t *) mfs_print }, + { &vop_read_desc, (vop_t *) mfs_read }, + { &vop_readdir_desc, (vop_t *) mfs_readdir }, + { &vop_readlink_desc, (vop_t *) mfs_readlink }, + { &vop_reclaim_desc, (vop_t *) ufs_reclaim }, + { &vop_remove_desc, (vop_t *) mfs_remove }, + { &vop_rename_desc, (vop_t *) mfs_rename }, + { &vop_revoke_desc, (vop_t *) mfs_revoke }, + { &vop_rmdir_desc, (vop_t *) mfs_rmdir }, + { &vop_seek_desc, (vop_t *) mfs_seek }, + { &vop_setattr_desc, (vop_t *) mfs_setattr }, + { &vop_strategy_desc, (vop_t *) mfs_strategy }, + { &vop_symlink_desc, (vop_t *) mfs_symlink }, + { &vop_truncate_desc, (vop_t *) mfs_truncate }, + { &vop_unlock_desc, (vop_t *) mfs_unlock }, + { &vop_update_desc, (vop_t *) mfs_update }, + { &vop_valloc_desc, (vop_t *) mfs_valloc }, + { &vop_vfree_desc, (vop_t *) mfs_vfree }, + { &vop_write_desc, (vop_t *) mfs_write }, { NULL, NULL } }; static struct vnodeopv_desc mfs_vnodeop_opv_desc = |
