diff options
Diffstat (limited to 'sys/miscfs')
-rw-r--r-- | sys/miscfs/deadfs/dead_vnops.c | 88 | ||||
-rw-r--r-- | sys/miscfs/devfs/devfs_vnops.c | 174 | ||||
-rw-r--r-- | sys/miscfs/devfs/devfsdefs.h | 6 | ||||
-rw-r--r-- | sys/miscfs/fdesc/fdesc.h | 4 | ||||
-rw-r--r-- | sys/miscfs/fdesc/fdesc_vnops.c | 88 | ||||
-rw-r--r-- | sys/miscfs/fifofs/fifo.h | 4 | ||||
-rw-r--r-- | sys/miscfs/fifofs/fifo_vnops.c | 88 | ||||
-rw-r--r-- | sys/miscfs/kernfs/kernfs.h | 4 | ||||
-rw-r--r-- | sys/miscfs/kernfs/kernfs_vnops.c | 88 | ||||
-rw-r--r-- | sys/miscfs/nullfs/null.h | 4 | ||||
-rw-r--r-- | sys/miscfs/nullfs/null_vnops.c | 20 | ||||
-rw-r--r-- | sys/miscfs/portal/portal.h | 4 | ||||
-rw-r--r-- | sys/miscfs/portal/portal_vnops.c | 88 | ||||
-rw-r--r-- | sys/miscfs/procfs/procfs.h | 4 | ||||
-rw-r--r-- | sys/miscfs/procfs/procfs_vnops.c | 86 | ||||
-rw-r--r-- | sys/miscfs/specfs/spec_vnops.c | 90 | ||||
-rw-r--r-- | sys/miscfs/specfs/specdev.h | 4 | ||||
-rw-r--r-- | sys/miscfs/umapfs/umap.h | 4 | ||||
-rw-r--r-- | sys/miscfs/umapfs/umap_vnops.c | 22 | ||||
-rw-r--r-- | sys/miscfs/union/union.h | 4 | ||||
-rw-r--r-- | sys/miscfs/union/union_vnops.c | 88 |
21 files changed, 481 insertions, 481 deletions
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index 56a33bc..55534d1 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.6 1994/10/08 22:37:00 phk Exp $ + * $Id: dead_vnops.c,v 1.7 1995/09/04 00:20:26 dyson Exp $ */ #include <sys/param.h> @@ -91,50 +91,50 @@ int dead_print __P((struct vop_print_args *)); #define dead_update ((int (*) __P((struct vop_update_args *)))nullop) #define dead_bwrite ((int (*) __P((struct vop_bwrite_args *)))nullop) -int (**dead_vnodeop_p)(); +vop_t **dead_vnodeop_p; struct vnodeopv_entry_desc dead_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, dead_lookup }, /* lookup */ - { &vop_create_desc, dead_create }, /* create */ - { &vop_mknod_desc, dead_mknod }, /* mknod */ - { &vop_open_desc, dead_open }, /* open */ - { &vop_close_desc, dead_close }, /* close */ - { &vop_access_desc, dead_access }, /* access */ - { &vop_getattr_desc, dead_getattr }, /* getattr */ - { &vop_setattr_desc, dead_setattr }, /* setattr */ - { &vop_read_desc, dead_read }, /* read */ - { &vop_write_desc, dead_write }, /* write */ - { &vop_ioctl_desc, dead_ioctl }, /* ioctl */ - { &vop_select_desc, dead_select }, /* select */ - { &vop_mmap_desc, dead_mmap }, /* mmap */ - { &vop_fsync_desc, dead_fsync }, /* fsync */ - { &vop_seek_desc, dead_seek }, /* seek */ - { &vop_remove_desc, dead_remove }, /* remove */ - { &vop_link_desc, dead_link }, /* link */ - { &vop_rename_desc, dead_rename }, /* rename */ - { &vop_mkdir_desc, dead_mkdir }, /* mkdir */ - { &vop_rmdir_desc, dead_rmdir }, /* rmdir */ - { &vop_symlink_desc, dead_symlink }, /* symlink */ - { &vop_readdir_desc, dead_readdir }, /* readdir */ - { &vop_readlink_desc, dead_readlink }, /* readlink */ - { &vop_abortop_desc, dead_abortop }, /* abortop */ - { &vop_inactive_desc, dead_inactive }, /* inactive */ - { &vop_reclaim_desc, dead_reclaim }, /* reclaim */ - { &vop_lock_desc, dead_lock }, /* lock */ - { &vop_unlock_desc, dead_unlock }, /* unlock */ - { &vop_bmap_desc, dead_bmap }, /* bmap */ - { &vop_strategy_desc, dead_strategy }, /* strategy */ - { &vop_print_desc, dead_print }, /* print */ - { &vop_islocked_desc, dead_islocked }, /* islocked */ - { &vop_pathconf_desc, dead_pathconf }, /* pathconf */ - { &vop_advlock_desc, dead_advlock }, /* advlock */ - { &vop_blkatoff_desc, dead_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, dead_valloc }, /* valloc */ - { &vop_vfree_desc, dead_vfree }, /* vfree */ - { &vop_truncate_desc, dead_truncate }, /* truncate */ - { &vop_update_desc, dead_update }, /* update */ - { &vop_bwrite_desc, dead_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*)())NULL } + { &vop_default_desc, (vop_t *)vn_default_error }, + { &vop_lookup_desc, (vop_t *)dead_lookup }, /* lookup */ + { &vop_create_desc, (vop_t *)dead_create }, /* create */ + { &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 */ + { &vop_ioctl_desc, (vop_t *)dead_ioctl }, /* ioctl */ + { &vop_select_desc, (vop_t *)dead_select }, /* select */ + { &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 */ + { &vop_vfree_desc, (vop_t *)dead_vfree }, /* vfree */ + { &vop_truncate_desc, (vop_t *)dead_truncate }, /* truncate */ + { &vop_update_desc, (vop_t *)dead_update }, /* update */ + { &vop_bwrite_desc, (vop_t *)dead_bwrite }, /* bwrite */ + { NULL, NULL } }; struct vnodeopv_desc dead_vnodeop_opv_desc = { &dead_vnodeop_p, dead_vnodeop_entries }; diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c index 58adaf0..a6a40eb 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.14 1995/10/04 11:05:07 julian Exp $ + * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.15 1995/10/10 07:12:27 julian Exp $ * * symlinks can wait 'til later. */ @@ -1634,50 +1634,50 @@ void devfs_dropvnode(dn_p dnp) /*proto*/ /* These are the operations used by directories etc in a devfs */ -int (**devfs_vnodeop_p)(void *); +vop_t **devfs_vnodeop_p; struct vnodeopv_entry_desc devfs_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, devfs_lookup }, /* lookup */ - { &vop_create_desc, devfs_create }, /* create */ - { &vop_mknod_desc, devfs_mknod }, /* mknod */ - { &vop_open_desc, devfs_open }, /* open */ - { &vop_close_desc, devfs_close }, /* close */ - { &vop_access_desc, devfs_access }, /* access */ - { &vop_getattr_desc, devfs_getattr }, /* getattr */ - { &vop_setattr_desc, devfs_setattr }, /* setattr */ - { &vop_read_desc, devfs_read }, /* read */ - { &vop_write_desc, devfs_write }, /* write */ - { &vop_ioctl_desc, devfs_ioctl }, /* ioctl */ - { &vop_select_desc, devfs_select }, /* select */ - { &vop_mmap_desc, devfs_mmap }, /* mmap */ - { &vop_fsync_desc, devfs_fsync }, /* fsync */ - { &vop_seek_desc, devfs_seek }, /* seek */ - { &vop_remove_desc, devfs_remove }, /* remove */ - { &vop_link_desc, devfs_link }, /* link */ - { &vop_rename_desc, devfs_rename }, /* rename */ - { &vop_mkdir_desc, devfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, devfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, devfs_symlink }, /* symlink */ - { &vop_readdir_desc, devfs_readdir }, /* readdir */ - { &vop_readlink_desc, devfs_readlink }, /* readlink */ - { &vop_abortop_desc, devfs_abortop }, /* abortop */ - { &vop_inactive_desc, devfs_inactive }, /* inactive */ - { &vop_reclaim_desc, devfs_reclaim }, /* reclaim */ - { &vop_lock_desc, devfs_lock }, /* lock */ - { &vop_unlock_desc, devfs_unlock }, /* unlock */ - { &vop_bmap_desc, devfs_bmap }, /* bmap */ - { &vop_strategy_desc, devfs_strategy }, /* strategy */ - { &vop_print_desc, devfs_print }, /* print */ - { &vop_islocked_desc, devfs_islocked }, /* islocked */ - { &vop_pathconf_desc, devfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, devfs_advlock }, /* advlock */ - { &vop_blkatoff_desc, devfs_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, devfs_valloc }, /* valloc */ - { &vop_vfree_desc, devfs_vfree }, /* vfree */ - { &vop_truncate_desc, devfs_truncate }, /* truncate */ - { &vop_update_desc, devfs_update }, /* update */ - { &vop_bwrite_desc, devfs_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*)(void *))NULL } + { &vop_default_desc, (vop_t *)vn_default_error }, + { &vop_lookup_desc, (vop_t *)devfs_lookup }, /* lookup */ + { &vop_create_desc, (vop_t *)devfs_create }, /* create */ + { &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 */ + { &vop_ioctl_desc, (vop_t *)devfs_ioctl }, /* ioctl */ + { &vop_select_desc, (vop_t *)devfs_select }, /* select */ + { &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 */ + { &vop_vfree_desc, (vop_t *)devfs_vfree }, /* vfree */ + { &vop_truncate_desc, (vop_t *)devfs_truncate }, /* truncate */ + { &vop_update_desc, (vop_t *)devfs_update }, /* update */ + { &vop_bwrite_desc, (vop_t *)devfs_bwrite }, /* bwrite */ + { NULL, NULL } }; struct vnodeopv_desc devfs_vnodeop_opv_desc = { &devfs_vnodeop_p, devfs_vnodeop_entries }; @@ -1724,50 +1724,50 @@ VNODEOP_SET(devfs_vnodeop_opv_desc); */ -int (**dev_spec_vnodeop_p)(void *); +vop_t **dev_spec_vnodeop_p; struct vnodeopv_entry_desc dev_spec_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, spec_lookup }, /* lookup */ - { &vop_create_desc, spec_create }, /* create */ - { &vop_mknod_desc, spec_mknod }, /* mknod */ - { &vop_open_desc, spec_open }, /* open */ - { &vop_close_desc, spec_close }, /* close */ - { &vop_access_desc, devfs_access }, /* access */ - { &vop_getattr_desc, devfs_getattr }, /* getattr */ - { &vop_setattr_desc, devfs_setattr }, /* setattr */ - { &vop_read_desc, spec_read }, /* read */ - { &vop_write_desc, spec_write }, /* write */ - { &vop_ioctl_desc, spec_ioctl }, /* ioctl */ - { &vop_select_desc, spec_select }, /* select */ - { &vop_mmap_desc, spec_mmap }, /* mmap */ - { &vop_fsync_desc, spec_fsync }, /* fsync */ - { &vop_seek_desc, spec_seek }, /* seek */ - { &vop_remove_desc, spec_remove }, /* remove */ - { &vop_link_desc, spec_link }, /* link */ - { &vop_rename_desc, spec_rename }, /* rename */ - { &vop_mkdir_desc, spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, spec_symlink }, /* symlink */ - { &vop_readdir_desc, spec_readdir }, /* readdir */ - { &vop_readlink_desc, spec_readlink }, /* readlink */ - { &vop_abortop_desc, spec_abortop }, /* abortop */ - { &vop_inactive_desc, spec_inactive }, /* inactive */ - { &vop_reclaim_desc, spec_reclaim }, /* reclaim */ - { &vop_lock_desc, spec_lock }, /* lock */ - { &vop_unlock_desc, spec_unlock }, /* unlock */ - { &vop_bmap_desc, spec_bmap }, /* bmap */ - { &vop_strategy_desc, spec_strategy }, /* strategy */ - { &vop_print_desc, spec_print }, /* print */ - { &vop_islocked_desc, spec_islocked }, /* islocked */ - { &vop_pathconf_desc, spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, spec_valloc }, /* valloc */ - { &vop_vfree_desc, spec_vfree }, /* vfree */ - { &vop_truncate_desc, spec_truncate }, /* truncate */ - { &vop_update_desc, spec_update }, /* update */ - { &vop_bwrite_desc, spec_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*)(void *))NULL } + { &vop_default_desc, (vop_t *)vn_default_error }, + { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ + { &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 *)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 *)spec_read }, /* read */ + { &vop_write_desc, (vop_t *)spec_write }, /* write */ + { &vop_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ + { &vop_select_desc, (vop_t *)spec_select }, /* select */ + { &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 */ + { &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_bwrite_desc, (vop_t *)spec_bwrite }, /* bwrite */ + { NULL, NULL } }; struct vnodeopv_desc dev_spec_vnodeop_opv_desc = { &dev_spec_vnodeop_p, dev_spec_vnodeop_entries }; diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h index 6973a98..1a64047 100644 --- a/sys/miscfs/devfs/devfsdefs.h +++ b/sys/miscfs/devfs/devfsdefs.h @@ -7,7 +7,7 @@ /* * Written by Julian Elischer (julian@DIALIX.oz.au) * - * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.6 1995/09/06 23:15:55 julian Exp $ + * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.7 1995/10/04 11:05:09 julian Exp $ */ /* first a couple of defines for compatibility with inodes */ @@ -68,8 +68,8 @@ #define DEV_SLNK 6 -extern int (**devfs_vnodeop_p)(void *); /* our own vector array for dirs */ -extern int (**dev_spec_vnodeop_p)(void *); /* our own vector array for devs */ +extern vop_t **devfs_vnodeop_p; /* our own vector array for dirs */ +extern vop_t **dev_spec_vnodeop_p; /* our own vector array for devs */ typedef struct dev_name *devnm_p; typedef struct devnode *dn_p; diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h index 4c682e7..3214004 100644 --- a/sys/miscfs/fdesc/fdesc.h +++ b/sys/miscfs/fdesc/fdesc.h @@ -35,7 +35,7 @@ * * @(#)fdesc.h 8.5 (Berkeley) 1/21/94 * - * $Id: fdesc.h,v 1.8 1993/04/06 15:28:33 jsp Exp $ + * $Id: fdesc.h,v 1.1.1.1 1994/05/24 10:04:59 rgrimes Exp $ */ #ifdef KERNEL @@ -77,6 +77,6 @@ extern dev_t devctty; extern int fdesc_init __P((void)); extern int fdesc_root __P((struct mount *, struct vnode **)); extern int fdesc_allocvp __P((fdntype, int, struct mount *, struct vnode **)); -extern int (**fdesc_vnodeop_p)(); +extern vop_t **fdesc_vnodeop_p; extern struct vfsops fdesc_vfsops; #endif /* KERNEL */ diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c index 3c334bb..5f2010b 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.10 1995/09/02 20:19:12 mpp Exp $ + * $Id: fdesc_vnops.c,v 1.11 1995/11/07 13:39:20 phk Exp $ */ /* @@ -936,50 +936,50 @@ fdesc_nullop() #define fdesc_update ((int (*) __P((struct vop_update_args *)))fdesc_enotsupp) #define fdesc_bwrite ((int (*) __P((struct vop_bwrite_args *)))fdesc_enotsupp) -static int (**fdesc_vnodeop_p)(); +static vop_t **fdesc_vnodeop_p; static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, fdesc_lookup }, /* lookup */ - { &vop_create_desc, fdesc_create }, /* create */ - { &vop_mknod_desc, fdesc_mknod }, /* mknod */ - { &vop_open_desc, fdesc_open }, /* open */ - { &vop_close_desc, fdesc_close }, /* close */ - { &vop_access_desc, fdesc_access }, /* access */ - { &vop_getattr_desc, fdesc_getattr }, /* getattr */ - { &vop_setattr_desc, fdesc_setattr }, /* setattr */ - { &vop_read_desc, fdesc_read }, /* read */ - { &vop_write_desc, fdesc_write }, /* write */ - { &vop_ioctl_desc, fdesc_ioctl }, /* ioctl */ - { &vop_select_desc, fdesc_select }, /* select */ - { &vop_mmap_desc, fdesc_mmap }, /* mmap */ - { &vop_fsync_desc, fdesc_fsync }, /* fsync */ - { &vop_seek_desc, fdesc_seek }, /* seek */ - { &vop_remove_desc, fdesc_remove }, /* remove */ - { &vop_link_desc, fdesc_link }, /* link */ - { &vop_rename_desc, fdesc_rename }, /* rename */ - { &vop_mkdir_desc, fdesc_mkdir }, /* mkdir */ - { &vop_rmdir_desc, fdesc_rmdir }, /* rmdir */ - { &vop_symlink_desc, fdesc_symlink }, /* symlink */ - { &vop_readdir_desc, fdesc_readdir }, /* readdir */ - { &vop_readlink_desc, fdesc_readlink }, /* readlink */ - { &vop_abortop_desc, fdesc_abortop }, /* abortop */ - { &vop_inactive_desc, fdesc_inactive }, /* inactive */ - { &vop_reclaim_desc, fdesc_reclaim }, /* reclaim */ - { &vop_lock_desc, fdesc_lock }, /* lock */ - { &vop_unlock_desc, fdesc_unlock }, /* unlock */ - { &vop_bmap_desc, fdesc_bmap }, /* bmap */ - { &vop_strategy_desc, fdesc_strategy }, /* strategy */ - { &vop_print_desc, fdesc_print }, /* print */ - { &vop_islocked_desc, fdesc_islocked }, /* islocked */ - { &vop_pathconf_desc, fdesc_pathconf }, /* pathconf */ - { &vop_advlock_desc, fdesc_advlock }, /* advlock */ - { &vop_blkatoff_desc, fdesc_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, fdesc_valloc }, /* valloc */ - { &vop_vfree_desc, fdesc_vfree }, /* vfree */ - { &vop_truncate_desc, fdesc_truncate }, /* truncate */ - { &vop_update_desc, fdesc_update }, /* update */ - { &vop_bwrite_desc, fdesc_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*)())NULL } + { &vop_default_desc, (vop_t *)vn_default_error }, + { &vop_lookup_desc, (vop_t *)fdesc_lookup }, /* lookup */ + { &vop_create_desc, (vop_t *)fdesc_create }, /* create */ + { &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 */ + { &vop_write_desc, (vop_t *)fdesc_write }, /* write */ + { &vop_ioctl_desc, (vop_t *)fdesc_ioctl }, /* ioctl */ + { &vop_select_desc, (vop_t *)fdesc_select }, /* select */ + { &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 */ + { &vop_vfree_desc, (vop_t *)fdesc_vfree }, /* vfree */ + { &vop_truncate_desc, (vop_t *)fdesc_truncate }, /* truncate */ + { &vop_update_desc, (vop_t *)fdesc_update }, /* update */ + { &vop_bwrite_desc, (vop_t *)fdesc_bwrite }, /* bwrite */ + { NULL, NULL } }; static struct vnodeopv_desc fdesc_vnodeop_opv_desc = { &fdesc_vnodeop_p, fdesc_vnodeop_entries }; diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h index 3f2d8ef..5556626 100644 --- a/sys/miscfs/fifofs/fifo.h +++ b/sys/miscfs/fifofs/fifo.h @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * @(#)fifo.h 8.2 (Berkeley) 2/2/94 - * $Id: fifo.h,v 1.4 1995/02/14 06:30:18 phk Exp $ + * $Id: fifo.h,v 1.5 1995/03/16 18:13:13 bde Exp $ */ -extern int (**fifo_vnodeop_p)(); +extern vop_t **fifo_vnodeop_p; /* * Prototypes for fifo operations on vnodes. diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index 8291ebb..dee76fb 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.2 (Berkeley) 1/4/94 - * $Id: fifo_vnops.c,v 1.10 1995/08/06 16:14:21 jkh Exp $ + * $Id: fifo_vnops.c,v 1.11 1995/09/04 00:20:33 dyson Exp $ */ #include <sys/param.h> @@ -62,50 +62,50 @@ struct fifoinfo { long fi_writers; }; -int (**fifo_vnodeop_p)(); +vop_t **fifo_vnodeop_p; struct vnodeopv_entry_desc fifo_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, fifo_lookup }, /* lookup */ - { &vop_create_desc, fifo_create }, /* create */ - { &vop_mknod_desc, fifo_mknod }, /* mknod */ - { &vop_open_desc, fifo_open }, /* open */ - { &vop_close_desc, fifo_close }, /* close */ - { &vop_access_desc, fifo_access }, /* access */ - { &vop_getattr_desc, fifo_getattr }, /* getattr */ - { &vop_setattr_desc, fifo_setattr }, /* setattr */ - { &vop_read_desc, fifo_read }, /* read */ - { &vop_write_desc, fifo_write }, /* write */ - { &vop_ioctl_desc, fifo_ioctl }, /* ioctl */ - { &vop_select_desc, fifo_select }, /* select */ - { &vop_mmap_desc, fifo_mmap }, /* mmap */ - { &vop_fsync_desc, fifo_fsync }, /* fsync */ - { &vop_seek_desc, fifo_seek }, /* seek */ - { &vop_remove_desc, fifo_remove }, /* remove */ - { &vop_link_desc, fifo_link }, /* link */ - { &vop_rename_desc, fifo_rename }, /* rename */ - { &vop_mkdir_desc, fifo_mkdir }, /* mkdir */ - { &vop_rmdir_desc, fifo_rmdir }, /* rmdir */ - { &vop_symlink_desc, fifo_symlink }, /* symlink */ - { &vop_readdir_desc, fifo_readdir }, /* readdir */ - { &vop_readlink_desc, fifo_readlink }, /* readlink */ - { &vop_abortop_desc, fifo_abortop }, /* abortop */ - { &vop_inactive_desc, fifo_inactive }, /* inactive */ - { &vop_reclaim_desc, fifo_reclaim }, /* reclaim */ - { &vop_lock_desc, fifo_lock }, /* lock */ - { &vop_unlock_desc, fifo_unlock }, /* unlock */ - { &vop_bmap_desc, fifo_bmap }, /* bmap */ - { &vop_strategy_desc, fifo_strategy }, /* strategy */ - { &vop_print_desc, fifo_print }, /* print */ - { &vop_islocked_desc, fifo_islocked }, /* islocked */ - { &vop_pathconf_desc, fifo_pathconf }, /* pathconf */ - { &vop_advlock_desc, fifo_advlock }, /* advlock */ - { &vop_blkatoff_desc, fifo_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, fifo_valloc }, /* valloc */ - { &vop_vfree_desc, fifo_vfree }, /* vfree */ - { &vop_truncate_desc, fifo_truncate }, /* truncate */ - { &vop_update_desc, fifo_update }, /* update */ - { &vop_bwrite_desc, fifo_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*)())NULL } + { &vop_default_desc, (vop_t *)vn_default_error }, + { &vop_lookup_desc, (vop_t *)fifo_lookup }, /* lookup */ + { &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_ioctl_desc, (vop_t *)fifo_ioctl }, /* ioctl */ + { &vop_select_desc, (vop_t *)fifo_select }, /* select */ + { &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 */ + { NULL, NULL } }; struct vnodeopv_desc fifo_vnodeop_opv_desc = { &fifo_vnodeop_p, fifo_vnodeop_entries }; diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h index 2def608..873ee4e 100644 --- a/sys/miscfs/kernfs/kernfs.h +++ b/sys/miscfs/kernfs/kernfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)kernfs.h 8.4 (Berkeley) 1/21/94 - * $Id$ + * $Id: kernfs.h,v 1.2 1994/08/02 07:44:59 davidg Exp $ */ #define _PATH_KERNFS "/kern" /* Default mountpoint */ @@ -51,7 +51,7 @@ struct kernfs_node { #define VFSTOKERNFS(mp) ((struct kernfs_mount *)((mp)->mnt_data)) #define VTOKERN(vp) ((struct kernfs_node *)(vp)->v_data) -extern int (**kernfs_vnodeop_p)(); +extern vop_t **kernfs_vnodeop_p; extern struct vfsops kernfs_vfsops; extern struct vnode *rrootvp; #endif /* KERNEL */ diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c index 1a7c07f..e541588 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.6 (Berkeley) 2/10/94 - * $Id: kernfs_vnops.c,v 1.10 1995/07/31 09:52:21 mpp Exp $ + * $Id: kernfs_vnops.c,v 1.11 1995/10/29 15:31:37 phk Exp $ */ /* @@ -750,50 +750,50 @@ kernfs_badop() #define kernfs_update ((int (*) __P((struct vop_update_args *)))kernfs_enotsupp) #define kernfs_bwrite ((int (*) __P((struct vop_bwrite_args *)))kernfs_enotsupp) -int (**kernfs_vnodeop_p)(); +vop_t **kernfs_vnodeop_p; static struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, kernfs_lookup }, /* lookup */ - { &vop_create_desc, kernfs_create }, /* create */ - { &vop_mknod_desc, kernfs_mknod }, /* mknod */ - { &vop_open_desc, kernfs_open }, /* open */ - { &vop_close_desc, kernfs_close }, /* close */ - { &vop_access_desc, kernfs_access }, /* access */ - { &vop_getattr_desc, kernfs_getattr }, /* getattr */ - { &vop_setattr_desc, kernfs_setattr }, /* setattr */ - { &vop_read_desc, kernfs_read }, /* read */ - { &vop_write_desc, kernfs_write }, /* write */ - { &vop_ioctl_desc, kernfs_ioctl }, /* ioctl */ - { &vop_select_desc, kernfs_select }, /* select */ - { &vop_mmap_desc, kernfs_mmap }, /* mmap */ - { &vop_fsync_desc, kernfs_fsync }, /* fsync */ - { &vop_seek_desc, kernfs_seek }, /* seek */ - { &vop_remove_desc, kernfs_remove }, /* remove */ - { &vop_link_desc, kernfs_link }, /* link */ - { &vop_rename_desc, kernfs_rename }, /* rename */ - { &vop_mkdir_desc, kernfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, kernfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, kernfs_symlink }, /* symlink */ - { &vop_readdir_desc, kernfs_readdir }, /* readdir */ - { &vop_readlink_desc, kernfs_readlink },/* readlink */ - { &vop_abortop_desc, kernfs_abortop }, /* abortop */ - { &vop_inactive_desc, kernfs_inactive },/* inactive */ - { &vop_reclaim_desc, kernfs_reclaim }, /* reclaim */ - { &vop_lock_desc, kernfs_lock }, /* lock */ - { &vop_unlock_desc, kernfs_unlock }, /* unlock */ - { &vop_bmap_desc, kernfs_bmap }, /* bmap */ - { &vop_strategy_desc, kernfs_strategy },/* strategy */ - { &vop_print_desc, kernfs_print }, /* print */ - { &vop_islocked_desc, kernfs_islocked },/* islocked */ - { &vop_pathconf_desc, kernfs_pathconf },/* pathconf */ - { &vop_advlock_desc, kernfs_advlock }, /* advlock */ - { &vop_blkatoff_desc, kernfs_blkatoff },/* blkatoff */ - { &vop_valloc_desc, kernfs_valloc }, /* valloc */ - { &vop_vfree_desc, kernfs_vfree }, /* vfree */ - { &vop_truncate_desc, kernfs_truncate },/* truncate */ - { &vop_update_desc, kernfs_update }, /* update */ - { &vop_bwrite_desc, kernfs_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*)())NULL } + { &vop_default_desc, (vop_t *)vn_default_error }, + { &vop_lookup_desc, (vop_t *)kernfs_lookup }, /* lookup */ + { &vop_create_desc, (vop_t *)kernfs_create }, /* create */ + { &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 */ + { &vop_ioctl_desc, (vop_t *)kernfs_ioctl }, /* ioctl */ + { &vop_select_desc, (vop_t *)kernfs_select }, /* select */ + { &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 */ + { &vop_vfree_desc, (vop_t *)kernfs_vfree }, /* vfree */ + { &vop_truncate_desc, (vop_t *)kernfs_truncate }, /* truncate */ + { &vop_update_desc, (vop_t *)kernfs_update }, /* update */ + { &vop_bwrite_desc, (vop_t *)kernfs_bwrite }, /* bwrite */ + { NULL, NULL } }; static struct vnodeopv_desc kernfs_vnodeop_opv_desc = { &kernfs_vnodeop_p, kernfs_vnodeop_entries }; diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h index 14286ff..f957249 100644 --- a/sys/miscfs/nullfs/null.h +++ b/sys/miscfs/nullfs/null.h @@ -35,7 +35,7 @@ * * @(#)null.h 8.2 (Berkeley) 1/21/94 * - * $Id: lofs.h,v 1.8 1992/05/30 10:05:43 jsp Exp jsp $ + * $Id: null.h,v 1.1.1.1 1994/05/24 10:05:04 rgrimes Exp $ */ struct null_args { @@ -70,6 +70,6 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno)); #define NULLVPTOLOWERVP(vp) (VTONULL(vp)->null_lowervp) #endif -extern int (**null_vnodeop_p)(); +extern vop_t **null_vnodeop_p; extern struct vfsops null_vfsops; #endif /* KERNEL */ diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c index 464d15a..41e9f70 100644 --- a/sys/miscfs/nullfs/null_vnops.c +++ b/sys/miscfs/nullfs/null_vnops.c @@ -35,7 +35,7 @@ * * @(#)null_vnops.c 8.1 (Berkeley) 6/10/93 * - * $Id: null_vnops.c,v 1.7 1995/03/19 14:28:54 davidg Exp $ + * $Id: null_vnops.c,v 1.8 1995/05/30 08:07:03 rgrimes Exp $ */ /* @@ -441,19 +441,19 @@ null_bwrite(ap) /* * Global vfs data structures */ -int (**null_vnodeop_p)(); +vop_t **null_vnodeop_p; struct vnodeopv_entry_desc null_vnodeop_entries[] = { - { &vop_default_desc, null_bypass }, + { &vop_default_desc, (vop_t *)null_bypass }, - { &vop_getattr_desc, null_getattr }, - { &vop_inactive_desc, null_inactive }, - { &vop_reclaim_desc, null_reclaim }, - { &vop_print_desc, null_print }, + { &vop_getattr_desc, (vop_t *)null_getattr }, + { &vop_inactive_desc, (vop_t *)null_inactive }, + { &vop_reclaim_desc, (vop_t *)null_reclaim }, + { &vop_print_desc, (vop_t *)null_print }, - { &vop_strategy_desc, null_strategy }, - { &vop_bwrite_desc, null_bwrite }, + { &vop_strategy_desc, (vop_t *)null_strategy }, + { &vop_bwrite_desc, (vop_t *)null_bwrite }, - { (struct vnodeop_desc*)NULL, (int(*)())NULL } + { NULL, NULL } }; struct vnodeopv_desc null_vnodeop_opv_desc = { &null_vnodeop_p, null_vnodeop_entries }; diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h index 38d7ee0..f2f1e7b 100644 --- a/sys/miscfs/portal/portal.h +++ b/sys/miscfs/portal/portal.h @@ -35,7 +35,7 @@ * * @(#)portal.h 8.4 (Berkeley) 1/21/94 * - * $Id: portal.h,v 1.3 1992/05/30 10:05:24 jsp Exp jsp $ + * $Id: portal.h,v 1.1.1.1 1994/05/24 10:05:06 rgrimes Exp $ */ struct portal_args { @@ -67,6 +67,6 @@ struct portalnode { #define PORTAL_ROOTFILEID 2 -extern int (**portal_vnodeop_p)(); +extern vop_t **portal_vnodeop_p; extern struct vfsops portal_vfsops; #endif /* KERNEL */ diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c index 4ee5824..7bea6da 100644 --- a/sys/miscfs/portal/portal_vnops.c +++ b/sys/miscfs/portal/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94 * - * $Id: portal_vnops.c,v 1.6 1995/05/30 08:07:06 rgrimes Exp $ + * $Id: portal_vnops.c,v 1.7 1995/10/08 00:09:00 swallace Exp $ */ /* @@ -659,50 +659,50 @@ portal_nullop() #define portal_update ((int (*) __P((struct vop_update_args *)))portal_enotsupp) #define portal_bwrite ((int (*) __P((struct vop_bwrite_args *)))portal_enotsupp) -int (**portal_vnodeop_p)(); +vop_t **portal_vnodeop_p; struct vnodeopv_entry_desc portal_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, portal_lookup }, /* lookup */ - { &vop_create_desc, portal_create }, /* create */ - { &vop_mknod_desc, portal_mknod }, /* mknod */ - { &vop_open_desc, portal_open }, /* open */ - { &vop_close_desc, portal_close }, /* close */ - { &vop_access_desc, portal_access }, /* access */ - { &vop_getattr_desc, portal_getattr }, /* getattr */ - { &vop_setattr_desc, portal_setattr }, /* setattr */ - { &vop_read_desc, portal_read }, /* read */ - { &vop_write_desc, portal_write }, /* write */ - { &vop_ioctl_desc, portal_ioctl }, /* ioctl */ - { &vop_select_desc, portal_select }, /* select */ - { &vop_mmap_desc, portal_mmap }, /* mmap */ - { &vop_fsync_desc, portal_fsync }, /* fsync */ - { &vop_seek_desc, portal_seek }, /* seek */ - { &vop_remove_desc, portal_remove }, /* remove */ - { &vop_link_desc, portal_link }, /* link */ - { &vop_rename_desc, portal_rename }, /* rename */ - { &vop_mkdir_desc, portal_mkdir }, /* mkdir */ - { &vop_rmdir_desc, portal_rmdir }, /* rmdir */ - { &vop_symlink_desc, portal_symlink }, /* symlink */ - { &vop_readdir_desc, portal_readdir }, /* readdir */ - { &vop_readlink_desc, portal_readlink }, /* readlink */ - { &vop_abortop_desc, portal_abortop }, /* abortop */ - { &vop_inactive_desc, portal_inactive }, /* inactive */ - { &vop_reclaim_desc, portal_reclaim }, /* reclaim */ - { &vop_lock_desc, portal_lock }, /* lock */ - { &vop_unlock_desc, portal_unlock }, /* unlock */ - { &vop_bmap_desc, portal_bmap }, /* bmap */ - { &vop_strategy_desc, portal_strategy }, /* strategy */ - { &vop_print_desc, portal_print }, /* print */ - { &vop_islocked_desc, portal_islocked }, /* islocked */ - { &vop_pathconf_desc, portal_pathconf }, /* pathconf */ - { &vop_advlock_desc, portal_advlock }, /* advlock */ - { &vop_blkatoff_desc, portal_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, portal_valloc }, /* valloc */ - { &vop_vfree_desc, portal_vfree }, /* vfree */ - { &vop_truncate_desc, portal_truncate }, /* truncate */ - { &vop_update_desc, portal_update }, /* update */ - { &vop_bwrite_desc, portal_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*)())NULL } + { &vop_default_desc, (vop_t *)vn_default_error }, + { &vop_lookup_desc, (vop_t *)portal_lookup }, /* lookup */ + { &vop_create_desc, (vop_t *)portal_create }, /* create */ + { &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 */ + { &vop_ioctl_desc, (vop_t *)portal_ioctl }, /* ioctl */ + { &vop_select_desc, (vop_t *)portal_select }, /* select */ + { &vop_mmap_desc, (vop_t *)portal_mmap }, /* mmap */ + { &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 */ + { &vop_vfree_desc, (vop_t *)portal_vfree }, /* vfree */ + { &vop_truncate_desc, (vop_t *)portal_truncate }, /* truncate */ + { &vop_update_desc, (vop_t *)portal_update }, /* update */ + { &vop_bwrite_desc, (vop_t *)portal_bwrite }, /* bwrite */ + { NULL, NULL } }; struct vnodeopv_desc portal_vnodeop_opv_desc = { &portal_vnodeop_p, portal_vnodeop_entries }; diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h index 4632f2b..f21813f 100644 --- a/sys/miscfs/procfs/procfs.h +++ b/sys/miscfs/procfs/procfs.h @@ -36,7 +36,7 @@ * * @(#)procfs.h 8.6 (Berkeley) 2/3/94 * - * $Id: procfs.h,v 1.5 1995/05/25 01:35:22 davidg Exp $ + * $Id: procfs.h,v 1.6 1995/11/07 13:39:29 phk Exp $ */ /* @@ -137,7 +137,7 @@ extern int procfs_dostatus __P((struct proc *, struct proc *, struct pfsnode *pf #define PROCFS_LOCKED 0x01 #define PROCFS_WANT 0x02 -extern int (**procfs_vnodeop_p)(); +extern vop_t **procfs_vnodeop_p; extern struct vfsops procfs_vfsops; int procfs_root __P((struct mount *, struct vnode **)); diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index c421569..fa3f0d4 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vnops.c 8.6 (Berkeley) 2/7/94 * - * $Id: procfs_vnops.c,v 1.16 1995/09/02 18:28:48 mpp Exp $ + * $Id: procfs_vnops.c,v 1.17 1995/11/07 13:39:31 phk Exp $ */ /* @@ -799,49 +799,49 @@ atopid(b, len) /* * procfs vnode operations. */ -int (**procfs_vnodeop_p)(); +vop_t **procfs_vnodeop_p; static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, procfs_lookup }, /* lookup */ - { &vop_create_desc, procfs_create }, /* create */ - { &vop_mknod_desc, procfs_mknod }, /* mknod */ - { &vop_open_desc, procfs_open }, /* open */ - { &vop_close_desc, procfs_close }, /* close */ - { &vop_access_desc, procfs_access }, /* access */ - { &vop_getattr_desc, procfs_getattr }, /* getattr */ - { &vop_setattr_desc, procfs_setattr }, /* setattr */ - { &vop_read_desc, procfs_read }, /* read */ - { &vop_write_desc, procfs_write }, /* write */ - { &vop_ioctl_desc, procfs_ioctl }, /* ioctl */ - { &vop_select_desc, procfs_select }, /* select */ - { &vop_mmap_desc, procfs_mmap }, /* mmap */ - { &vop_fsync_desc, procfs_fsync }, /* fsync */ - { &vop_seek_desc, procfs_seek }, /* seek */ - { &vop_remove_desc, procfs_remove }, /* remove */ - { &vop_link_desc, procfs_link }, /* link */ - { &vop_rename_desc, procfs_rename }, /* rename */ - { &vop_mkdir_desc, procfs_mkdir }, /* mkdir */ - { &vop_rmdir_desc, procfs_rmdir }, /* rmdir */ - { &vop_symlink_desc, procfs_symlink }, /* symlink */ - { &vop_readdir_desc, procfs_readdir }, /* readdir */ - { &vop_readlink_desc, procfs_readlink }, /* readlink */ - { &vop_abortop_desc, procfs_abortop }, /* abortop */ - { &vop_inactive_desc, procfs_inactive }, /* inactive */ - { &vop_reclaim_desc, procfs_reclaim }, /* reclaim */ - { &vop_lock_desc, procfs_lock }, /* lock */ - { &vop_unlock_desc, procfs_unlock }, /* unlock */ - { &vop_bmap_desc, procfs_bmap }, /* bmap */ - { &vop_strategy_desc, procfs_strategy }, /* strategy */ - { &vop_print_desc, procfs_print }, /* print */ - { &vop_islocked_desc, procfs_islocked }, /* islocked */ - { &vop_pathconf_desc, procfs_pathconf }, /* pathconf */ - { &vop_advlock_desc, procfs_advlock }, /* advlock */ - { &vop_blkatoff_desc, procfs_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, procfs_valloc }, /* valloc */ - { &vop_vfree_desc, procfs_vfree }, /* vfree */ - { &vop_truncate_desc, procfs_truncate }, /* truncate */ - { &vop_update_desc, procfs_update }, /* update */ - { (struct vnodeop_desc*)NULL, (int(*)())NULL } + { &vop_default_desc, (vop_t *)vn_default_error }, + { &vop_lookup_desc, (vop_t *)procfs_lookup }, /* lookup */ + { &vop_create_desc, (vop_t *)procfs_create }, /* create */ + { &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 */ + { &vop_ioctl_desc, (vop_t *)procfs_ioctl }, /* ioctl */ + { &vop_select_desc, (vop_t *)procfs_select }, /* select */ + { &vop_mmap_desc, (vop_t *)procfs_mmap }, /* mmap */ + { &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 */ + { &vop_vfree_desc, (vop_t *)procfs_vfree }, /* vfree */ + { &vop_truncate_desc, (vop_t *)procfs_truncate }, /* truncate */ + { &vop_update_desc, (vop_t *)procfs_update }, /* update */ + { NULL, NULL } }; static struct vnodeopv_desc procfs_vnodeop_opv_desc = { &procfs_vnodeop_p, procfs_vnodeop_entries }; diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index c7430b5..b9ed634 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.6 (Berkeley) 4/9/94 - * $Id: spec_vnops.c,v 1.15 1995/10/06 09:47:58 phk Exp $ + * $Id: spec_vnops.c,v 1.16 1995/10/23 02:22:47 dyson Exp $ */ #include <sys/param.h> @@ -51,51 +51,51 @@ #include <miscfs/specfs/specdev.h> struct vnode *speclisth[SPECHSZ]; -int (**spec_vnodeop_p)(); +vop_t **spec_vnodeop_p; struct vnodeopv_entry_desc spec_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, spec_lookup }, /* lookup */ - { &vop_create_desc, spec_create }, /* create */ - { &vop_mknod_desc, spec_mknod }, /* mknod */ - { &vop_open_desc, spec_open }, /* open */ - { &vop_close_desc, spec_close }, /* close */ - { &vop_access_desc, spec_access }, /* access */ - { &vop_getattr_desc, spec_getattr }, /* getattr */ - { &vop_setattr_desc, spec_setattr }, /* setattr */ - { &vop_read_desc, spec_read }, /* read */ - { &vop_write_desc, spec_write }, /* write */ - { &vop_ioctl_desc, spec_ioctl }, /* ioctl */ - { &vop_select_desc, spec_select }, /* select */ - { &vop_mmap_desc, spec_mmap }, /* mmap */ - { &vop_fsync_desc, spec_fsync }, /* fsync */ - { &vop_seek_desc, spec_seek }, /* seek */ - { &vop_remove_desc, spec_remove }, /* remove */ - { &vop_link_desc, spec_link }, /* link */ - { &vop_rename_desc, spec_rename }, /* rename */ - { &vop_mkdir_desc, spec_mkdir }, /* mkdir */ - { &vop_rmdir_desc, spec_rmdir }, /* rmdir */ - { &vop_symlink_desc, spec_symlink }, /* symlink */ - { &vop_readdir_desc, spec_readdir }, /* readdir */ - { &vop_readlink_desc, spec_readlink }, /* readlink */ - { &vop_abortop_desc, spec_abortop }, /* abortop */ - { &vop_inactive_desc, spec_inactive }, /* inactive */ - { &vop_reclaim_desc, spec_reclaim }, /* reclaim */ - { &vop_lock_desc, spec_lock }, /* lock */ - { &vop_unlock_desc, spec_unlock }, /* unlock */ - { &vop_bmap_desc, spec_bmap }, /* bmap */ - { &vop_strategy_desc, spec_strategy }, /* strategy */ - { &vop_print_desc, spec_print }, /* print */ - { &vop_islocked_desc, spec_islocked }, /* islocked */ - { &vop_pathconf_desc, spec_pathconf }, /* pathconf */ - { &vop_advlock_desc, spec_advlock }, /* advlock */ - { &vop_blkatoff_desc, spec_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, spec_valloc }, /* valloc */ - { &vop_vfree_desc, spec_vfree }, /* vfree */ - { &vop_truncate_desc, spec_truncate }, /* truncate */ - { &vop_update_desc, spec_update }, /* update */ - { &vop_bwrite_desc, vn_bwrite }, /* bwrite */ - { &vop_getpages_desc, spec_getpages}, /* getpages */ - { (struct vnodeop_desc*)NULL, (int(*)())NULL } + { &vop_default_desc, (vop_t *)vn_default_error }, + { &vop_lookup_desc, (vop_t *)spec_lookup }, /* lookup */ + { &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 *)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_ioctl_desc, (vop_t *)spec_ioctl }, /* ioctl */ + { &vop_select_desc, (vop_t *)spec_select }, /* select */ + { &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 */ + { &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_bwrite_desc, (vop_t *)vn_bwrite }, /* bwrite */ + { &vop_getpages_desc, (vop_t *)spec_getpages}, /* getpages */ + { NULL, NULL } }; struct vnodeopv_desc spec_vnodeop_opv_desc = { &spec_vnodeop_p, spec_vnodeop_entries }; diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h index 3ef7359..01a799b 100644 --- a/sys/miscfs/specfs/specdev.h +++ b/sys/miscfs/specfs/specdev.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)specdev.h 8.2 (Berkeley) 2/2/94 - * $Id: specdev.h,v 1.3 1995/07/29 11:40:32 bde Exp $ + * $Id: specdev.h,v 1.4 1995/10/23 02:22:51 dyson Exp $ */ /* @@ -73,7 +73,7 @@ extern struct vnode *speclisth[SPECHSZ]; /* * Prototypes for special file operations on vnodes. */ -extern int (**spec_vnodeop_p)(); +extern vop_t **spec_vnodeop_p; struct nameidata; struct componentname; struct ucred; diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h index 5be2e5e..ad78ccd 100644 --- a/sys/miscfs/umapfs/umap.h +++ b/sys/miscfs/umapfs/umap.h @@ -35,7 +35,7 @@ * * @(#)umap.h 8.3 (Berkeley) 1/21/94 * - * $Id: umap.h,v 1.2 1994/08/02 07:45:33 davidg Exp $ + * $Id: umap.h,v 1.3 1995/05/30 08:07:15 rgrimes Exp $ */ #define MAPFILEENTRIES 64 @@ -87,6 +87,6 @@ extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno)); #define UMAPVPTOLOWERVP(vp) (VTOUMAP(vp)->umap_lowervp) #endif -extern int (**umap_vnodeop_p)(); +extern vop_t **umap_vnodeop_p; extern struct vfsops umap_vfsops; #endif /* KERNEL */ diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c index a82d1c6..1d2d586 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.3 (Berkeley) 1/5/94 - * $Id: umap_vnops.c,v 1.8 1995/03/19 14:28:55 davidg Exp $ + * $Id: umap_vnops.c,v 1.9 1995/05/30 08:07:22 rgrimes Exp $ */ /* @@ -471,20 +471,20 @@ umap_rename(ap) * go away with a merged buffer/block cache. * */ -int (**umap_vnodeop_p)(); +vop_t **umap_vnodeop_p; struct vnodeopv_entry_desc umap_vnodeop_entries[] = { - { &vop_default_desc, umap_bypass }, + { &vop_default_desc, (vop_t *)umap_bypass }, - { &vop_getattr_desc, umap_getattr }, - { &vop_inactive_desc, umap_inactive }, - { &vop_reclaim_desc, umap_reclaim }, - { &vop_print_desc, umap_print }, - { &vop_rename_desc, umap_rename }, + { &vop_getattr_desc, (vop_t *)umap_getattr }, + { &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, umap_strategy }, - { &vop_bwrite_desc, umap_bwrite }, + { &vop_strategy_desc, (vop_t *)umap_strategy }, + { &vop_bwrite_desc, (vop_t *)umap_bwrite }, - { (struct vnodeop_desc*) NULL, (int(*)()) NULL } + { NULL, NULL } }; struct vnodeopv_desc umap_vnodeop_opv_desc = { &umap_vnodeop_p, umap_vnodeop_entries }; diff --git a/sys/miscfs/union/union.h b/sys/miscfs/union/union.h index 05fa481..55c1c87 100644 --- a/sys/miscfs/union/union.h +++ b/sys/miscfs/union/union.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union.h 8.2 (Berkeley) 2/17/94 - * $Id: union.h,v 1.2 1994/08/02 07:45:42 davidg Exp $ + * $Id: union.h,v 1.3 1995/03/16 18:14:02 bde Exp $ */ struct union_args { @@ -116,6 +116,6 @@ extern void union_newupper __P((struct union_node *, struct vnode *)); #define UPPERVP(vp) (VTOUNION(vp)->un_uppervp) #define OTHERVP(vp) (UPPERVP(vp) ? UPPERVP(vp) : LOWERVP(vp)) -extern int (**union_vnodeop_p)(); +extern vop_t **union_vnodeop_p; extern struct vfsops union_vfsops; #endif /* KERNEL */ diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index 04db44f..3955414 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.6 (Berkeley) 2/17/94 - * $Id: union_vnops.c,v 1.11 1995/08/17 11:53:51 bde Exp $ + * $Id: union_vnops.c,v 1.12 1995/09/04 00:20:41 dyson Exp $ */ #include <sys/param.h> @@ -1452,52 +1452,52 @@ union_strategy(ap) /* * Global vfs data structures */ -int (**union_vnodeop_p)(); +vop_t **union_vnodeop_p; struct vnodeopv_entry_desc union_vnodeop_entries[] = { - { &vop_default_desc, vn_default_error }, - { &vop_lookup_desc, union_lookup }, /* lookup */ - { &vop_create_desc, union_create }, /* create */ - { &vop_mknod_desc, union_mknod }, /* mknod */ - { &vop_open_desc, union_open }, /* open */ - { &vop_close_desc, union_close }, /* close */ - { &vop_access_desc, union_access }, /* access */ - { &vop_getattr_desc, union_getattr }, /* getattr */ - { &vop_setattr_desc, union_setattr }, /* setattr */ - { &vop_read_desc, union_read }, /* read */ - { &vop_write_desc, union_write }, /* write */ - { &vop_ioctl_desc, union_ioctl }, /* ioctl */ - { &vop_select_desc, union_select }, /* select */ - { &vop_mmap_desc, union_mmap }, /* mmap */ - { &vop_fsync_desc, union_fsync }, /* fsync */ - { &vop_seek_desc, union_seek }, /* seek */ - { &vop_remove_desc, union_remove }, /* remove */ - { &vop_link_desc, union_link }, /* link */ - { &vop_rename_desc, union_rename }, /* rename */ - { &vop_mkdir_desc, union_mkdir }, /* mkdir */ - { &vop_rmdir_desc, union_rmdir }, /* rmdir */ - { &vop_symlink_desc, union_symlink }, /* symlink */ - { &vop_readdir_desc, union_readdir }, /* readdir */ - { &vop_readlink_desc, union_readlink }, /* readlink */ - { &vop_abortop_desc, union_abortop }, /* abortop */ - { &vop_inactive_desc, union_inactive }, /* inactive */ - { &vop_reclaim_desc, union_reclaim }, /* reclaim */ - { &vop_lock_desc, union_lock }, /* lock */ - { &vop_unlock_desc, union_unlock }, /* unlock */ - { &vop_bmap_desc, union_bmap }, /* bmap */ - { &vop_strategy_desc, union_strategy }, /* strategy */ - { &vop_print_desc, union_print }, /* print */ - { &vop_islocked_desc, union_islocked }, /* islocked */ - { &vop_pathconf_desc, union_pathconf }, /* pathconf */ - { &vop_advlock_desc, union_advlock }, /* advlock */ + { &vop_default_desc, (vop_t *)vn_default_error }, + { &vop_lookup_desc, (vop_t *)union_lookup }, /* lookup */ + { &vop_create_desc, (vop_t *)union_create }, /* create */ + { &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_ioctl_desc, (vop_t *)union_ioctl }, /* ioctl */ + { &vop_select_desc, (vop_t *)union_select }, /* select */ + { &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, union_blkatoff }, /* blkatoff */ - { &vop_valloc_desc, union_valloc }, /* valloc */ - { &vop_vfree_desc, union_vfree }, /* vfree */ - { &vop_truncate_desc, union_truncate }, /* truncate */ - { &vop_update_desc, union_update }, /* update */ - { &vop_bwrite_desc, union_bwrite }, /* bwrite */ + { &vop_blkatoff_desc, (vop_t *)union_blkatoff }, /* blkatoff */ + { &vop_valloc_desc, (vop_t *)union_valloc }, /* valloc */ + { &vop_vfree_desc, (vop_t *)union_vfree }, /* vfree */ + { &vop_truncate_desc, (vop_t *)union_truncate }, /* truncate */ + { &vop_update_desc, (vop_t *)union_update }, /* update */ + { &vop_bwrite_desc, (vop_t *)union_bwrite }, /* bwrite */ #endif - { (struct vnodeop_desc*)NULL, (int(*)())NULL } + { NULL, NULL } }; struct vnodeopv_desc union_vnodeop_opv_desc = { &union_vnodeop_p, union_vnodeop_entries }; |