From 26130e0b77925018ba132e00c658f19fa1110124 Mon Sep 17 00:00:00 2001 From: phk Date: Wed, 15 Oct 1997 09:22:02 +0000 Subject: Stylistic overhaul of vnops tables. 1. Remove comment stating the blatantly obvious. 2. Align in two columns. 3. Sort all but the default element alphabetically. 4. Remove XXX comments pointing out entries not needed. --- sys/gnu/ext2fs/ext2_vnops.c | 256 ++++++++++++++++++++--------------------- sys/gnu/fs/ext2fs/ext2_vnops.c | 256 ++++++++++++++++++++--------------------- 2 files changed, 254 insertions(+), 258 deletions(-) (limited to 'sys/gnu') 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 = -- cgit v1.1