Introduce vnodepv_entry_t as type for the vnodeopv_entry functions.
authorJoerg Sonnenberger <joerg@dragonflybsd.org>
Tue, 15 Feb 2005 08:32:19 +0000 (08:32 +0000)
committerJoerg Sonnenberger <joerg@dragonflybsd.org>
Tue, 15 Feb 2005 08:32:19 +0000 (08:32 +0000)
This is slightly better than casting all the functions to void *,
which is a data pointer.

23 files changed:
sys/sys/vnode.h
sys/vfs/coda/coda_vnops.c
sys/vfs/deadfs/dead_vnops.c
sys/vfs/fdesc/fdesc_vnops.c
sys/vfs/fifofs/fifo_vnops.c
sys/vfs/gnu/ext2fs/ext2_vnops.c
sys/vfs/hpfs/hpfs_vnops.c
sys/vfs/isofs/cd9660/cd9660_vnops.c
sys/vfs/mfs/mfs_vnops.c
sys/vfs/msdosfs/msdosfs_vnops.c
sys/vfs/nfs/nfs_vnops.c
sys/vfs/ntfs/ntfs_vnops.c
sys/vfs/nullfs/null_vnops.c
sys/vfs/nwfs/nwfs_vnops.c
sys/vfs/portal/portal_vnops.c
sys/vfs/procfs/procfs_vnops.c
sys/vfs/smbfs/smbfs_vnops.c
sys/vfs/specfs/spec_vnops.c
sys/vfs/udf/udf_vnops.c
sys/vfs/ufs/ffs_vnops.c
sys/vfs/ufs/ufs_vnops.c
sys/vfs/umapfs/umap_vnops.c
sys/vfs/union/union_vnops.c

index 9589865..e6adbd5 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)vnode.h     8.7 (Berkeley) 2/4/94
  * $FreeBSD: src/sys/sys/vnode.h,v 1.111.2.19 2002/12/29 18:19:53 dillon Exp $
- * $DragonFly: src/sys/sys/vnode.h,v 1.30 2004/12/29 02:40:03 dillon Exp $
+ * $DragonFly: src/sys/sys/vnode.h,v 1.31 2005/02/15 08:32:18 joerg Exp $
  */
 
 #ifndef _SYS_VNODE_H_
@@ -441,6 +441,7 @@ extern struct lwkt_token mntvnode_token;
 #define        VOPARG_OFFSETTO(S_TYPE,S_OFFSET,STRUCT_P) \
        ((S_TYPE)(((char*)(STRUCT_P))+(S_OFFSET)))
 
+typedef int (*vnodeopv_entry_t)(struct vop_generic_args *);
 
 /*
  * This structure is used to configure the new vnodeops vector.  The entry
@@ -449,7 +450,7 @@ extern struct lwkt_token mntvnode_token;
  */
 struct vnodeopv_entry_desc {
        struct vnodeop_desc *opve_op;
-       int     (*opve_func)(struct vop_generic_args *ap);
+       vnodeopv_entry_t opve_func;
 };
 
 struct vnodeopv_desc {
index 50f8cb8..87f5257 100644 (file)
@@ -28,7 +28,7 @@
  * 
  *     @(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
  * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.22.2.1 2001/06/29 16:26:22 shafeeq Exp $
- * $DragonFly: src/sys/vfs/coda/Attic/coda_vnops.c,v 1.24 2004/12/17 00:18:14 dillon Exp $
+ * $DragonFly: src/sys/vfs/coda/Attic/coda_vnops.c,v 1.25 2005/02/15 08:32:18 joerg Exp $
  * 
  */
 
@@ -111,46 +111,46 @@ static int coda_lockdebug = 0;
 /* Definition of the vnode operation vector */
 
 struct vnodeopv_entry_desc coda_vnodeop_entries[] = {
-    { &vop_default_desc, (void *)coda_vop_error },
-    { &vop_lookup_desc, (void *)coda_lookup },         /* lookup */
-    { &vop_create_desc, (void *)coda_create },         /* create */
-    { &vop_mknod_desc, (void *)coda_vop_error },       /* mknod */
-    { &vop_open_desc, (void *)coda_open },             /* open */
-    { &vop_close_desc, (void *)coda_close },           /* close */
-    { &vop_access_desc, (void *)coda_access },         /* access */
-    { &vop_getattr_desc, (void *)coda_getattr },       /* getattr */
-    { &vop_setattr_desc, (void *)coda_setattr },       /* setattr */
-    { &vop_read_desc, (void *)coda_read },             /* read */
-    { &vop_write_desc, (void *)coda_write },           /* write */
-    { &vop_ioctl_desc, (void *)coda_ioctl },           /* ioctl */
-    { &vop_mmap_desc, (void *)coda_vop_error },                /* mmap */
-    { &vop_fsync_desc, (void *)coda_fsync },           /* fsync */
-    { &vop_remove_desc, (void *)coda_remove },         /* remove */
-    { &vop_link_desc, (void *)coda_link },             /* link */
-    { &vop_rename_desc, (void *)coda_rename },         /* rename */
-    { &vop_mkdir_desc, (void *)coda_mkdir },           /* mkdir */
-    { &vop_rmdir_desc, (void *)coda_rmdir },           /* rmdir */
-    { &vop_symlink_desc, (void *)coda_symlink },       /* symlink */
-    { &vop_readdir_desc, (void *)coda_readdir },       /* readdir */
-    { &vop_readlink_desc, (void *)coda_readlink },     /* readlink */
-    { &vop_inactive_desc, (void *)coda_inactive },     /* inactive */
-    { &vop_reclaim_desc, (void *)coda_reclaim },       /* reclaim */
-    { &vop_lock_desc, (void *)coda_lock },             /* lock */
-    { &vop_unlock_desc, (void *)coda_unlock },         /* unlock */
-    { &vop_bmap_desc, (void *)coda_bmap },             /* bmap */
-    { &vop_strategy_desc, (void *)coda_strategy },     /* strategy */
-    { &vop_print_desc, (void *)coda_vop_error },       /* print */
-    { &vop_islocked_desc, (void *)coda_islocked },     /* islocked */
-    { &vop_pathconf_desc, (void *)coda_vop_error },    /* pathconf */
-    { &vop_advlock_desc, (void *)coda_vop_nop },       /* advlock */
-    { &vop_bwrite_desc, (void *)coda_vop_error },      /* bwrite */
-    { &vop_lease_desc, (void *)coda_vop_nop },         /* lease */
-    { &vop_poll_desc, (void *) vop_stdpoll },          /* poll */
-    { &vop_getpages_desc, (void *)coda_fbsd_getpages },        /* pager intf.*/
-    { &vop_putpages_desc, (void *)coda_fbsd_putpages },        /* pager intf.*/
-    { &vop_createvobject_desc,      (void *) vop_stdcreatevobject },
-    { &vop_destroyvobject_desc,     (void *) vop_stddestroyvobject },
-    { &vop_getvobject_desc,         (void *) vop_stdgetvobject },
+    { &vop_default_desc, (vnodeopv_entry_t)coda_vop_error },
+    { &vop_lookup_desc, (vnodeopv_entry_t)coda_lookup },       /* lookup */
+    { &vop_create_desc, (vnodeopv_entry_t)coda_create },       /* create */
+    { &vop_mknod_desc, (vnodeopv_entry_t)coda_vop_error },     /* mknod */
+    { &vop_open_desc, (vnodeopv_entry_t)coda_open },           /* open */
+    { &vop_close_desc, (vnodeopv_entry_t)coda_close },         /* close */
+    { &vop_access_desc, (vnodeopv_entry_t)coda_access },       /* access */
+    { &vop_getattr_desc, (vnodeopv_entry_t)coda_getattr },     /* getattr */
+    { &vop_setattr_desc, (vnodeopv_entry_t)coda_setattr },     /* setattr */
+    { &vop_read_desc, (vnodeopv_entry_t)coda_read },           /* read */
+    { &vop_write_desc, (vnodeopv_entry_t)coda_write },         /* write */
+    { &vop_ioctl_desc, (vnodeopv_entry_t)coda_ioctl },         /* ioctl */
+    { &vop_mmap_desc, (vnodeopv_entry_t)coda_vop_error },      /* mmap */
+    { &vop_fsync_desc, (vnodeopv_entry_t)coda_fsync },         /* fsync */
+    { &vop_remove_desc, (vnodeopv_entry_t)coda_remove },       /* remove */
+    { &vop_link_desc, (vnodeopv_entry_t)coda_link },           /* link */
+    { &vop_rename_desc, (vnodeopv_entry_t)coda_rename },       /* rename */
+    { &vop_mkdir_desc, (vnodeopv_entry_t)coda_mkdir },         /* mkdir */
+    { &vop_rmdir_desc, (vnodeopv_entry_t)coda_rmdir },         /* rmdir */
+    { &vop_symlink_desc, (vnodeopv_entry_t)coda_symlink },     /* symlink */
+    { &vop_readdir_desc, (vnodeopv_entry_t)coda_readdir },     /* readdir */
+    { &vop_readlink_desc, (vnodeopv_entry_t)coda_readlink },   /* readlink */
+    { &vop_inactive_desc, (vnodeopv_entry_t)coda_inactive },   /* inactive */
+    { &vop_reclaim_desc, (vnodeopv_entry_t)coda_reclaim },     /* reclaim */
+    { &vop_lock_desc, (vnodeopv_entry_t)coda_lock },           /* lock */
+    { &vop_unlock_desc, (vnodeopv_entry_t)coda_unlock },       /* unlock */
+    { &vop_bmap_desc, (vnodeopv_entry_t)coda_bmap },           /* bmap */
+    { &vop_strategy_desc, (vnodeopv_entry_t)coda_strategy },   /* strategy */
+    { &vop_print_desc, (vnodeopv_entry_t)coda_vop_error },     /* print */
+    { &vop_islocked_desc, (vnodeopv_entry_t)coda_islocked },   /* islocked */
+    { &vop_pathconf_desc, (vnodeopv_entry_t)coda_vop_error },  /* pathconf */
+    { &vop_advlock_desc, (vnodeopv_entry_t)coda_vop_nop },     /* advlock */
+    { &vop_bwrite_desc, (vnodeopv_entry_t)coda_vop_error },    /* bwrite */
+    { &vop_lease_desc, (vnodeopv_entry_t)coda_vop_nop },       /* lease */
+    { &vop_poll_desc, vop_stdpoll },           /* poll */
+    { &vop_getpages_desc, (vnodeopv_entry_t)coda_fbsd_getpages }, /* pager intf.*/
+    { &vop_putpages_desc, (vnodeopv_entry_t)coda_fbsd_putpages }, /* pager intf.*/
+    { &vop_createvobject_desc,      vop_stdcreatevobject },
+    { &vop_destroyvobject_desc,     vop_stddestroyvobject },
+    { &vop_getvobject_desc,         vop_stdgetvobject },
 
 #if    0
 
@@ -162,9 +162,9 @@ struct vnodeopv_entry_desc coda_vnodeop_entries[] = {
 #define UFS_UPDATE(aa, bb) VFSTOUFS((aa)->v_mount)->um_update(aa, bb)
 
     missing
-    { &vop_reallocblks_desc,   (void *) ufs_missingop },
-    { &vop_lookup_desc,                (void *) ufs_lookup },
-    { &vop_whiteout_desc,      (void *) ufs_whiteout },
+    { &vop_reallocblks_desc,   (vnodeopv_entry_t) ufs_missingop },
+    { &vop_lookup_desc,                (vnodeopv_entry_t) ufs_lookup },
+    { &vop_whiteout_desc,      (vnodeopv_entry_t) ufs_whiteout },
 #endif
     { NULL, NULL }
 };
index b237388..d3ad723 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)dead_vnops.c        8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/miscfs/deadfs/dead_vnops.c,v 1.26 1999/08/28 00:46:42 peter Exp $
- * $DragonFly: src/sys/vfs/deadfs/dead_vnops.c,v 1.11 2004/10/12 19:20:52 dillon Exp $
+ * $DragonFly: src/sys/vfs/deadfs/dead_vnops.c,v 1.12 2005/02/15 08:32:18 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -62,31 +62,31 @@ static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
        { &vop_access_desc,             vop_ebadf },
        { &vop_advlock_desc,            vop_ebadf },
-       { &vop_bmap_desc,               (void *) dead_bmap },
-       { &vop_create_desc,             (void *) dead_badop },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) dead_bmap },
+       { &vop_create_desc,             (vnodeopv_entry_t) dead_badop },
        { &vop_getattr_desc,            vop_ebadf },
        { &vop_inactive_desc,           vop_null },
-       { &vop_ioctl_desc,              (void *) dead_ioctl },
-       { &vop_link_desc,               (void *) dead_badop },
-       { &vop_lock_desc,               (void *) dead_lock },
-       { &vop_lookup_desc,             (void *) dead_lookup },
-       { &vop_mkdir_desc,              (void *) dead_badop },
-       { &vop_mknod_desc,              (void *) dead_badop },
-       { &vop_mmap_desc,               (void *) dead_badop },
-       { &vop_open_desc,               (void *) dead_open },
+       { &vop_ioctl_desc,              (vnodeopv_entry_t) dead_ioctl },
+       { &vop_link_desc,               (vnodeopv_entry_t) dead_badop },
+       { &vop_lock_desc,               (vnodeopv_entry_t) dead_lock },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) dead_lookup },
+       { &vop_mkdir_desc,              (vnodeopv_entry_t) dead_badop },
+       { &vop_mknod_desc,              (vnodeopv_entry_t) dead_badop },
+       { &vop_mmap_desc,               (vnodeopv_entry_t) dead_badop },
+       { &vop_open_desc,               (vnodeopv_entry_t) dead_open },
        { &vop_pathconf_desc,           vop_ebadf },    /* per pathconf(2) */
-       { &vop_poll_desc,               (void *) dead_poll },
-       { &vop_print_desc,              (void *) dead_print },
-       { &vop_read_desc,               (void *) dead_read },
+       { &vop_poll_desc,               (vnodeopv_entry_t) dead_poll },
+       { &vop_print_desc,              (vnodeopv_entry_t) dead_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) dead_read },
        { &vop_readdir_desc,            vop_ebadf },
        { &vop_readlink_desc,           vop_ebadf },
        { &vop_reclaim_desc,            vop_null },
-       { &vop_remove_desc,             (void *) dead_badop },
-       { &vop_rename_desc,             (void *) dead_badop },
-       { &vop_rmdir_desc,              (void *) dead_badop },
+       { &vop_remove_desc,             (vnodeopv_entry_t) dead_badop },
+       { &vop_rename_desc,             (vnodeopv_entry_t) dead_badop },
+       { &vop_rmdir_desc,              (vnodeopv_entry_t) dead_badop },
        { &vop_setattr_desc,            vop_ebadf },
-       { &vop_symlink_desc,            (void *) dead_badop },
-       { &vop_write_desc,              (void *) dead_write },
+       { &vop_symlink_desc,            (vnodeopv_entry_t) dead_badop },
+       { &vop_write_desc,              (vnodeopv_entry_t) dead_write },
        { NULL, NULL }
 };
 static struct vnodeopv_desc dead_vnodeop_opv_desc =
index 401eb76..84461dd 100644 (file)
@@ -36,7 +36,7 @@
  *     @(#)fdesc_vnops.c       8.9 (Berkeley) 1/21/94
  *
  * $FreeBSD: src/sys/miscfs/fdesc/fdesc_vnops.c,v 1.47.2.1 2001/10/22 22:49:26 chris Exp $
- * $DragonFly: src/sys/vfs/fdesc/fdesc_vnops.c,v 1.16 2004/12/17 00:18:18 dillon Exp $
+ * $DragonFly: src/sys/vfs/fdesc/fdesc_vnops.c,v 1.17 2005/02/15 08:32:18 joerg Exp $
  */
 
 /*
@@ -527,18 +527,18 @@ fdesc_print(struct vop_print_args *ap)
 }
 
 struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
-       { &vop_default_desc,            (void *) vop_defaultop },
-       { &vop_access_desc,             (void *) vop_null },
-       { &vop_getattr_desc,            (void *) fdesc_getattr },
-       { &vop_inactive_desc,           (void *) fdesc_inactive },
-       { &vop_lookup_desc,             (void *) fdesc_lookup },
-       { &vop_open_desc,               (void *) fdesc_open },
-       { &vop_pathconf_desc,           (void *) vop_stdpathconf },
-       { &vop_poll_desc,               (void *) fdesc_poll },
-       { &vop_print_desc,              (void *) fdesc_print },
-       { &vop_readdir_desc,            (void *) fdesc_readdir },
-       { &vop_reclaim_desc,            (void *) fdesc_reclaim },
-       { &vop_setattr_desc,            (void *) fdesc_setattr },
+       { &vop_default_desc,            vop_defaultop },
+       { &vop_access_desc,             vop_null },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) fdesc_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) fdesc_inactive },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) fdesc_lookup },
+       { &vop_open_desc,               (vnodeopv_entry_t) fdesc_open },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) vop_stdpathconf },
+       { &vop_poll_desc,               (vnodeopv_entry_t) fdesc_poll },
+       { &vop_print_desc,              (vnodeopv_entry_t) fdesc_print },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) fdesc_readdir },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) fdesc_reclaim },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) fdesc_setattr },
        { NULL, NULL }
 };
 
index 436f426..d994647 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)fifo_vnops.c        8.10 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/miscfs/fifofs/fifo_vnops.c,v 1.45.2.4 2003/04/22 10:11:24 bde Exp $
- * $DragonFly: src/sys/vfs/fifofs/fifo_vnops.c,v 1.17 2004/10/12 19:20:54 dillon Exp $
+ * $DragonFly: src/sys/vfs/fifofs/fifo_vnops.c,v 1.18 2005/02/15 08:32:18 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -90,36 +90,36 @@ static struct filterops fifowrite_filtops =
   
 struct vop_ops *fifo_vnode_vops;
 static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
-       { &vop_default_desc,            (void *) vop_defaultop },
-       { &vop_access_desc,             (void *) vop_ebadf },
-       { &vop_advlock_desc,            (void *) fifo_advlock },
-       { &vop_bmap_desc,               (void *) fifo_bmap },
-       { &vop_close_desc,              (void *) fifo_close },
-       { &vop_create_desc,             (void *) fifo_badop },
-       { &vop_getattr_desc,            (void *) vop_ebadf },
-       { &vop_inactive_desc,           (void *) fifo_inactive },
-       { &vop_ioctl_desc,              (void *) fifo_ioctl },
-       { &vop_kqfilter_desc,           (void *) fifo_kqfilter },
-       { &vop_lease_desc,              (void *) vop_null },
-       { &vop_link_desc,               (void *) fifo_badop },
-       { &vop_lookup_desc,             (void *) fifo_lookup },
-       { &vop_mkdir_desc,              (void *) fifo_badop },
-       { &vop_mknod_desc,              (void *) fifo_badop },
-       { &vop_open_desc,               (void *) fifo_open },
-       { &vop_pathconf_desc,           (void *) fifo_pathconf },
-       { &vop_poll_desc,               (void *) fifo_poll },
-       { &vop_print_desc,              (void *) fifo_print },
-       { &vop_read_desc,               (void *) fifo_read },
-       { &vop_readdir_desc,            (void *) fifo_badop },
-       { &vop_readlink_desc,           (void *) fifo_badop },
-       { &vop_reallocblks_desc,        (void *) fifo_badop },
-       { &vop_reclaim_desc,            (void *) vop_null },
-       { &vop_remove_desc,             (void *) fifo_badop },
-       { &vop_rename_desc,             (void *) fifo_badop },
-       { &vop_rmdir_desc,              (void *) fifo_badop },
-       { &vop_setattr_desc,            (void *) vop_ebadf },
-       { &vop_symlink_desc,            (void *) fifo_badop },
-       { &vop_write_desc,              (void *) fifo_write },
+       { &vop_default_desc,            (vnodeopv_entry_t) vop_defaultop },
+       { &vop_access_desc,             (vnodeopv_entry_t) vop_ebadf },
+       { &vop_advlock_desc,            (vnodeopv_entry_t) fifo_advlock },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) fifo_bmap },
+       { &vop_close_desc,              (vnodeopv_entry_t) fifo_close },
+       { &vop_create_desc,             (vnodeopv_entry_t) fifo_badop },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) vop_ebadf },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) fifo_inactive },
+       { &vop_ioctl_desc,              (vnodeopv_entry_t) fifo_ioctl },
+       { &vop_kqfilter_desc,           (vnodeopv_entry_t) fifo_kqfilter },
+       { &vop_lease_desc,              (vnodeopv_entry_t) vop_null },
+       { &vop_link_desc,               (vnodeopv_entry_t) fifo_badop },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) fifo_lookup },
+       { &vop_mkdir_desc,              (vnodeopv_entry_t) fifo_badop },
+       { &vop_mknod_desc,              (vnodeopv_entry_t) fifo_badop },
+       { &vop_open_desc,               (vnodeopv_entry_t) fifo_open },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) fifo_pathconf },
+       { &vop_poll_desc,               (vnodeopv_entry_t) fifo_poll },
+       { &vop_print_desc,              (vnodeopv_entry_t) fifo_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) fifo_read },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) fifo_badop },
+       { &vop_readlink_desc,           (vnodeopv_entry_t) fifo_badop },
+       { &vop_reallocblks_desc,        (vnodeopv_entry_t) fifo_badop },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) vop_null },
+       { &vop_remove_desc,             (vnodeopv_entry_t) fifo_badop },
+       { &vop_rename_desc,             (vnodeopv_entry_t) fifo_badop },
+       { &vop_rmdir_desc,              (vnodeopv_entry_t) fifo_badop },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) vop_ebadf },
+       { &vop_symlink_desc,            (vnodeopv_entry_t) fifo_badop },
+       { &vop_write_desc,              (vnodeopv_entry_t) fifo_write },
        { NULL, NULL }
 };
 static struct vnodeopv_desc fifo_vnodeop_opv_desc =
index 8ba26a6..1d0b276 100644 (file)
@@ -44,7 +44,7 @@
  *     @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
  *     @(#)ext2_vnops.c        8.7 (Berkeley) 2/3/94
  * $FreeBSD: src/sys/gnu/ext2fs/ext2_vnops.c,v 1.51.2.2 2003/01/02 17:26:18 bde Exp $
- * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vnops.c,v 1.18 2004/12/22 02:17:07 dillon Exp $
+ * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vnops.c,v 1.19 2005/02/15 08:32:18 joerg Exp $
  */
 
 #include "opt_quota.h"
@@ -98,38 +98,38 @@ static int ext2_putpages (struct vop_putpages_args *);
 
 /* Global vfs data structures for ufs. */
 struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
-       { &vop_default_desc,            (void *) ufs_vnoperate },
-       { &vop_fsync_desc,              (void *) ext2_fsync },
-       { &vop_inactive_desc,           (void *) ext2_inactive },
-       { &vop_lookup_desc,             (void *) ext2_lookup },
-       { &vop_read_desc,               (void *) ext2_read },
-       { &vop_readdir_desc,            (void *) ext2_readdir },
-       { &vop_reallocblks_desc,        (void *) ext2_reallocblks },
-       { &vop_write_desc,              (void *) ext2_write },
-       { &vop_remove_desc,             (void *) ext2_remove },
-       { &vop_link_desc,               (void *) ext2_link },
-       { &vop_rename_desc,             (void *) ext2_rename },
-       { &vop_mkdir_desc,              (void *) ext2_mkdir },
-       { &vop_rmdir_desc,              (void *) ext2_rmdir },
-       { &vop_create_desc,             (void *) ext2_create },
-       { &vop_mknod_desc,              (void *) ext2_mknod },
-       { &vop_symlink_desc,            (void *) ext2_symlink },
-       { &vop_getpages_desc,           (void *) ext2_getpages },
-       { &vop_putpages_desc,           (void *) ext2_putpages },
+       { &vop_default_desc,            (vnodeopv_entry_t) ufs_vnoperate },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) ext2_fsync },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) ext2_inactive },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) ext2_lookup },
+       { &vop_read_desc,               (vnodeopv_entry_t) ext2_read },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) ext2_readdir },
+       { &vop_reallocblks_desc,        (vnodeopv_entry_t) ext2_reallocblks },
+       { &vop_write_desc,              (vnodeopv_entry_t) ext2_write },
+       { &vop_remove_desc,             (vnodeopv_entry_t) ext2_remove },
+       { &vop_link_desc,               (vnodeopv_entry_t) ext2_link },
+       { &vop_rename_desc,             (vnodeopv_entry_t) ext2_rename },
+       { &vop_mkdir_desc,              (vnodeopv_entry_t) ext2_mkdir },
+       { &vop_rmdir_desc,              (vnodeopv_entry_t) ext2_rmdir },
+       { &vop_create_desc,             (vnodeopv_entry_t) ext2_create },
+       { &vop_mknod_desc,              (vnodeopv_entry_t) ext2_mknod },
+       { &vop_symlink_desc,            (vnodeopv_entry_t) ext2_symlink },
+       { &vop_getpages_desc,           (vnodeopv_entry_t) ext2_getpages },
+       { &vop_putpages_desc,           (vnodeopv_entry_t) ext2_putpages },
        { NULL, NULL }
 };
 
 struct vnodeopv_entry_desc ext2_specop_entries[] = {
-       { &vop_default_desc,            (void *) ufs_vnoperatespec },
-       { &vop_fsync_desc,              (void *) ext2_fsync },
-       { &vop_inactive_desc,           (void *) ext2_inactive },
+       { &vop_default_desc,            (vnodeopv_entry_t) ufs_vnoperatespec },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) ext2_fsync },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) ext2_inactive },
        { NULL, NULL }
 };
 
 struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
-       { &vop_default_desc,            (void *) ufs_vnoperatefifo },
-       { &vop_fsync_desc,              (void *) ext2_fsync },
-       { &vop_inactive_desc,           (void *) ext2_inactive },
+       { &vop_default_desc,            (vnodeopv_entry_t) ufs_vnoperatefifo },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) ext2_fsync },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) ext2_inactive },
        { NULL, NULL }
 };
 
index 141c853..e08ac6b 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.2.2.2 2002/01/15 18:35:09 semenu Exp $
- * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.21 2004/11/12 00:09:33 dillon Exp $
+ * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.22 2005/02/15 08:32:18 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -1298,49 +1298,49 @@ hpfs_pathconf(struct vop_pathconf_args *ap)
  */
 #if defined(__DragonFly__)
 struct vnodeopv_entry_desc hpfs_vnodeop_entries[] = {
-       { &vop_default_desc, (void *)vop_defaultop },
-
-       { &vop_getattr_desc, (void *)hpfs_getattr },
-       { &vop_setattr_desc, (void *)hpfs_setattr },
-       { &vop_inactive_desc, (void *)hpfs_inactive },
-       { &vop_reclaim_desc, (void *)hpfs_reclaim },
-       { &vop_print_desc, (void *)hpfs_print },
-       { &vop_create_desc, (void *)hpfs_create },
-       { &vop_remove_desc, (void *)hpfs_remove },
-       { &vop_islocked_desc, (void *)vop_stdislocked },
-       { &vop_unlock_desc, (void *)vop_stdunlock },
-       { &vop_lock_desc, (void *)vop_stdlock },
-       { &vop_lookup_desc, (void *)hpfs_lookup },
-       { &vop_access_desc, (void *)hpfs_access },
-       { &vop_close_desc, (void *)hpfs_close },
-       { &vop_open_desc, (void *)hpfs_open },
-       { &vop_readdir_desc, (void *)hpfs_readdir },
-       { &vop_fsync_desc, (void *)hpfs_fsync },
-       { &vop_bmap_desc, (void *)hpfs_bmap },
-       { &vop_getpages_desc, (void *) hpfs_getpages },
-       { &vop_putpages_desc, (void *) hpfs_putpages },
-       { &vop_strategy_desc, (void *)hpfs_strategy },
-       { &vop_bwrite_desc, (void *)vop_stdbwrite },
-       { &vop_read_desc, (void *)hpfs_read },
-       { &vop_write_desc, (void *)hpfs_write },
-       { &vop_ioctl_desc, (void *)hpfs_ioctl },
-       { &vop_pathconf_desc, (void *)hpfs_pathconf },
+       { &vop_default_desc, vop_defaultop },
+
+       { &vop_getattr_desc, (vnodeopv_entry_t)hpfs_getattr },
+       { &vop_setattr_desc, (vnodeopv_entry_t)hpfs_setattr },
+       { &vop_inactive_desc, (vnodeopv_entry_t)hpfs_inactive },
+       { &vop_reclaim_desc, (vnodeopv_entry_t)hpfs_reclaim },
+       { &vop_print_desc, (vnodeopv_entry_t)hpfs_print },
+       { &vop_create_desc, (vnodeopv_entry_t)hpfs_create },
+       { &vop_remove_desc, (vnodeopv_entry_t)hpfs_remove },
+       { &vop_islocked_desc, vop_stdislocked },
+       { &vop_unlock_desc, vop_stdunlock },
+       { &vop_lock_desc, vop_stdlock },
+       { &vop_lookup_desc, (vnodeopv_entry_t)hpfs_lookup },
+       { &vop_access_desc, (vnodeopv_entry_t)hpfs_access },
+       { &vop_close_desc, (vnodeopv_entry_t)hpfs_close },
+       { &vop_open_desc, (vnodeopv_entry_t)hpfs_open },
+       { &vop_readdir_desc, (vnodeopv_entry_t)hpfs_readdir },
+       { &vop_fsync_desc, (vnodeopv_entry_t)hpfs_fsync },
+       { &vop_bmap_desc, (vnodeopv_entry_t)hpfs_bmap },
+       { &vop_getpages_desc, (vnodeopv_entry_t) hpfs_getpages },
+       { &vop_putpages_desc, (vnodeopv_entry_t) hpfs_putpages },
+       { &vop_strategy_desc, (vnodeopv_entry_t)hpfs_strategy },
+       { &vop_bwrite_desc, vop_stdbwrite },
+       { &vop_read_desc, (vnodeopv_entry_t)hpfs_read },
+       { &vop_write_desc, (vnodeopv_entry_t)hpfs_write },
+       { &vop_ioctl_desc, (vnodeopv_entry_t)hpfs_ioctl },
+       { &vop_pathconf_desc, (vnodeopv_entry_t)hpfs_pathconf },
        { NULL, NULL }
 };
 
 #else /* defined(__NetBSD__) */
 struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = {
-       { &vop_default_desc, (void *) genfs_badop },    /* XXX */
-       { &vop_lookup_desc, (void *) hpfs_lookup },     /* lookup */
+       { &vop_default_desc, (vnodeopv_entry_t) genfs_badop },  /* XXX */
+       { &vop_lookup_desc, (vnodeopv_entry_t) hpfs_lookup },   /* lookup */
        { &vop_create_desc, genfs_eopnotsupp },         /* create */
        { &vop_mknod_desc, genfs_eopnotsupp },          /* mknod */
-       { &vop_open_desc, (void *) hpfs_open }, /* open */
-       { &vop_close_desc,(void *) hpfs_close },        /* close */
-       { &vop_access_desc, (void *) hpfs_access },     /* access */
-       { &vop_getattr_desc, (void *) hpfs_getattr },   /* getattr */
+       { &vop_open_desc, (vnodeopv_entry_t) hpfs_open },       /* open */
+       { &vop_close_desc,(vnodeopv_entry_t) hpfs_close },      /* close */
+       { &vop_access_desc, (vnodeopv_entry_t) hpfs_access },   /* access */
+       { &vop_getattr_desc, (vnodeopv_entry_t) hpfs_getattr }, /* getattr */
        { &vop_setattr_desc, genfs_eopnotsupp },        /* setattr */
-       { &vop_read_desc, (void *) hpfs_read }, /* read */
-       { &vop_write_desc, (void *) hpfs_write },       /* write */
+       { &vop_read_desc, (vnodeopv_entry_t) hpfs_read },       /* read */
+       { &vop_write_desc, (vnodeopv_entry_t) hpfs_write },     /* write */
        { &vop_lease_desc, genfs_lease_check },         /* lease */
        { &vop_fcntl_desc, genfs_fcntl },               /* fcntl */
        { &vop_ioctl_desc, genfs_enoioctl },            /* ioctl */
@@ -1355,16 +1355,16 @@ struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = {
        { &vop_mkdir_desc, genfs_eopnotsupp },          /* mkdir */
        { &vop_rmdir_desc, genfs_eopnotsupp },          /* rmdir */
        { &vop_symlink_desc, genfs_eopnotsupp },        /* symlink */
-       { &vop_readdir_desc, (void *) hpfs_readdir },   /* readdir */
+       { &vop_readdir_desc, (vnodeopv_entry_t) hpfs_readdir }, /* readdir */
        { &vop_readlink_desc, genfs_eopnotsupp },       /* readlink */
        { &vop_abortop_desc, genfs_abortop },           /* abortop */
-       { &vop_inactive_desc, (void *) hpfs_inactive }, /* inactive */
-       { &vop_reclaim_desc, (void *) hpfs_reclaim },   /* reclaim */
+       { &vop_inactive_desc, (vnodeopv_entry_t) hpfs_inactive },       /* inactive */
+       { &vop_reclaim_desc, (vnodeopv_entry_t) hpfs_reclaim }, /* reclaim */
        { &vop_lock_desc, genfs_lock },                 /* lock */
        { &vop_unlock_desc, genfs_unlock },             /* unlock */
-       { &vop_bmap_desc, (void *) hpfs_bmap }, /* bmap */
-       { &vop_strategy_desc, (void *) hpfs_strategy }, /* strategy */
-       { &vop_print_desc, (void *) hpfs_print },       /* print */
+       { &vop_bmap_desc, (vnodeopv_entry_t) hpfs_bmap },       /* bmap */
+       { &vop_strategy_desc, (vnodeopv_entry_t) hpfs_strategy },       /* strategy */
+       { &vop_print_desc, (vnodeopv_entry_t) hpfs_print },     /* print */
        { &vop_islocked_desc, genfs_islocked },         /* islocked */
        { &vop_pathconf_desc, hpfs_pathconf },          /* pathconf */
        { &vop_advlock_desc, genfs_nullop },            /* advlock */
@@ -1375,7 +1375,7 @@ struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = {
        { &vop_truncate_desc, genfs_eopnotsupp },       /* truncate */
        { &vop_update_desc, genfs_eopnotsupp },         /* update */
        { &vop_bwrite_desc, vn_bwrite },                /* bwrite */
-       { (struct vnodeop_desc *)NULL, (int (*) (void *))NULL }
+       { NULL, NULL }
 };
 
 #endif
index 2205176..125fbd2 100644 (file)
@@ -37,7 +37,7 @@
  *
  *     @(#)cd9660_vnops.c      8.19 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.62 1999/12/15 23:01:51 eivind Exp $
- * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vnops.c,v 1.13 2004/11/12 00:09:34 dillon Exp $
+ * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vnops.c,v 1.14 2005/02/15 08:32:18 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -843,27 +843,27 @@ cd9660_advlock(ap)
  * Global vfs data structures for cd9660
  */
 struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
-       { &vop_default_desc,            (void *) vop_defaultop },
-       { &vop_access_desc,             (void *) cd9660_access },
-       { &vop_advlock_desc,            (void *) cd9660_advlock },
-       { &vop_bmap_desc,               (void *) cd9660_bmap },
-       { &vop_lookup_desc,             (void *) cd9660_lookup },
-       { &vop_getattr_desc,            (void *) cd9660_getattr },
-       { &vop_inactive_desc,           (void *) cd9660_inactive },
-       { &vop_ioctl_desc,              (void *) cd9660_ioctl },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_pathconf_desc,           (void *) cd9660_pathconf },
-       { &vop_print_desc,              (void *) cd9660_print },
-       { &vop_read_desc,               (void *) cd9660_read },
-       { &vop_readdir_desc,            (void *) cd9660_readdir },
-       { &vop_readlink_desc,           (void *) cd9660_readlink },
-       { &vop_reclaim_desc,            (void *) cd9660_reclaim },
-       { &vop_setattr_desc,            (void *) cd9660_setattr },
-       { &vop_strategy_desc,           (void *) cd9660_strategy },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
-       { &vop_getpages_desc,           (void *) cd9660_getpages },
-       { &vop_putpages_desc,           (void *) cd9660_putpages },
+       { &vop_default_desc,            (vnodeopv_entry_t) vop_defaultop },
+       { &vop_access_desc,             (vnodeopv_entry_t) cd9660_access },
+       { &vop_advlock_desc,            (vnodeopv_entry_t) cd9660_advlock },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) cd9660_bmap },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) cd9660_lookup },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) cd9660_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) cd9660_inactive },
+       { &vop_ioctl_desc,              (vnodeopv_entry_t) cd9660_ioctl },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) cd9660_pathconf },
+       { &vop_print_desc,              (vnodeopv_entry_t) cd9660_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) cd9660_read },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) cd9660_readdir },
+       { &vop_readlink_desc,           (vnodeopv_entry_t) cd9660_readlink },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) cd9660_reclaim },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) cd9660_setattr },
+       { &vop_strategy_desc,           (vnodeopv_entry_t) cd9660_strategy },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
+       { &vop_getpages_desc,           (vnodeopv_entry_t) cd9660_getpages },
+       { &vop_putpages_desc,           (vnodeopv_entry_t) cd9660_putpages },
        { NULL, NULL }
 };
 
@@ -871,30 +871,30 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
  * Special device vnode ops
  */
 struct vnodeopv_entry_desc cd9660_specop_entries[] = {
-       { &vop_default_desc,            (void *) spec_vnoperate },
-       { &vop_access_desc,             (void *) cd9660_access },
-       { &vop_getattr_desc,            (void *) cd9660_getattr },
-       { &vop_inactive_desc,           (void *) cd9660_inactive },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_print_desc,              (void *) cd9660_print },
-       { &vop_reclaim_desc,            (void *) cd9660_reclaim },
-       { &vop_setattr_desc,            (void *) cd9660_setattr },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
+       { &vop_default_desc,            (vnodeopv_entry_t) spec_vnoperate },
+       { &vop_access_desc,             (vnodeopv_entry_t) cd9660_access },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) cd9660_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) cd9660_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_print_desc,              (vnodeopv_entry_t) cd9660_print },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) cd9660_reclaim },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) cd9660_setattr },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
        { NULL, NULL }
 };
 
 struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
-       { &vop_default_desc,            (void *) fifo_vnoperate },
-       { &vop_access_desc,             (void *) cd9660_access },
-       { &vop_getattr_desc,            (void *) cd9660_getattr },
-       { &vop_inactive_desc,           (void *) cd9660_inactive },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_print_desc,              (void *) cd9660_print },
-       { &vop_reclaim_desc,            (void *) cd9660_reclaim },
-       { &vop_setattr_desc,            (void *) cd9660_setattr },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
+       { &vop_default_desc,            (vnodeopv_entry_t) fifo_vnoperate },
+       { &vop_access_desc,             (vnodeopv_entry_t) cd9660_access },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) cd9660_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) cd9660_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_print_desc,              (vnodeopv_entry_t) cd9660_print },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) cd9660_reclaim },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) cd9660_setattr },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
        { NULL, NULL }
 };
 
index fd655bb..91cfe7e 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)mfs_vnops.c 8.11 (Berkeley) 5/22/95
  * $FreeBSD: src/sys/ufs/mfs/mfs_vnops.c,v 1.47.2.1 2001/05/22 02:06:43 bp Exp $
- * $DragonFly: src/sys/vfs/mfs/mfs_vnops.c,v 1.16 2004/10/12 19:20:59 dillon Exp $
+ * $DragonFly: src/sys/vfs/mfs/mfs_vnops.c,v 1.17 2005/02/15 08:32:18 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -68,24 +68,24 @@ static int  mfs_getpages (struct vop_getpages_args *); /* XXX */
  */
 struct vop_ops *mfs_vnode_vops;
 static struct vnodeopv_entry_desc mfs_vnodeop_entries[] = {
-       { &vop_default_desc,            (void *) mfs_badop },
-       { &vop_bmap_desc,               (void *) mfs_bmap },
+       { &vop_default_desc,            (vnodeopv_entry_t) mfs_badop },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) mfs_bmap },
        { &vop_bwrite_desc,             vop_defaultop },
-       { &vop_close_desc,              (void *) mfs_close },
-       { &vop_createvobject_desc,      (void *) vop_stdcreatevobject },
-       { &vop_destroyvobject_desc,     (void *) vop_stddestroyvobject },
-       { &vop_freeblks_desc,           (void *) mfs_freeblks },
-       { &vop_fsync_desc,              (void *) mfs_fsync },
-       { &vop_getpages_desc,           (void *) mfs_getpages },
-       { &vop_getvobject_desc,         (void *) vop_stdgetvobject },
-       { &vop_inactive_desc,           (void *) mfs_inactive },
+       { &vop_close_desc,              (vnodeopv_entry_t) mfs_close },
+       { &vop_createvobject_desc,      (vnodeopv_entry_t) vop_stdcreatevobject },
+       { &vop_destroyvobject_desc,     (vnodeopv_entry_t) vop_stddestroyvobject },
+       { &vop_freeblks_desc,           (vnodeopv_entry_t) mfs_freeblks },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) mfs_fsync },
+       { &vop_getpages_desc,           (vnodeopv_entry_t) mfs_getpages },
+       { &vop_getvobject_desc,         (vnodeopv_entry_t) vop_stdgetvobject },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) mfs_inactive },
        { &vop_ioctl_desc,              vop_enotty },
        { &vop_islocked_desc,           vop_defaultop },
        { &vop_lock_desc,               vop_defaultop },
-       { &vop_open_desc,               (void *) mfs_open },
-       { &vop_print_desc,              (void *) mfs_print },
-       { &vop_reclaim_desc,            (void *) mfs_reclaim },
-       { &vop_strategy_desc,           (void *) mfs_strategy },
+       { &vop_open_desc,               (vnodeopv_entry_t) mfs_open },
+       { &vop_print_desc,              (vnodeopv_entry_t) mfs_print },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) mfs_reclaim },
+       { &vop_strategy_desc,           (vnodeopv_entry_t) mfs_strategy },
        { &vop_unlock_desc,             vop_defaultop },
        { NULL, NULL }
 };
index bd1ed8b..ce95b46 100644 (file)
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/msdosfs/msdosfs_vnops.c,v 1.95.2.4 2003/06/13 15:05:47 trhodes Exp $ */
-/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.22 2004/12/22 02:17:08 dillon Exp $ */
+/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.23 2005/02/15 08:32:18 joerg Exp $ */
 /*     $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $   */
 
 /*-
@@ -1940,33 +1940,33 @@ msdosfs_putpages(struct vop_putpages_args *ap)
 /* Global vfs data structures for msdosfs */
 struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
-       { &vop_access_desc,             (void *) msdosfs_access },
-       { &vop_bmap_desc,               (void *) msdosfs_bmap },
-       { &vop_lookup_desc,             (void *) msdosfs_lookup },
-       { &vop_close_desc,              (void *) msdosfs_close },
-       { &vop_create_desc,             (void *) msdosfs_create },
-       { &vop_fsync_desc,              (void *) msdosfs_fsync },
-       { &vop_getattr_desc,            (void *) msdosfs_getattr },
-       { &vop_inactive_desc,           (void *) msdosfs_inactive },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_link_desc,               (void *) msdosfs_link },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_mkdir_desc,              (void *) msdosfs_mkdir },
-       { &vop_mknod_desc,              (void *) msdosfs_mknod },
-       { &vop_pathconf_desc,           (void *) msdosfs_pathconf },
-       { &vop_print_desc,              (void *) msdosfs_print },
-       { &vop_read_desc,               (void *) msdosfs_read },
-       { &vop_readdir_desc,            (void *) msdosfs_readdir },
-       { &vop_reclaim_desc,            (void *) msdosfs_reclaim },
-       { &vop_remove_desc,             (void *) msdosfs_remove },
-       { &vop_rename_desc,             (void *) msdosfs_rename },
-       { &vop_rmdir_desc,              (void *) msdosfs_rmdir },
-       { &vop_setattr_desc,            (void *) msdosfs_setattr },
-       { &vop_strategy_desc,           (void *) msdosfs_strategy },
-       { &vop_symlink_desc,            (void *) msdosfs_symlink },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
-       { &vop_write_desc,              (void *) msdosfs_write },
-       { &vop_getpages_desc,           (void *) msdosfs_getpages },
-       { &vop_putpages_desc,           (void *) msdosfs_putpages },
+       { &vop_access_desc,             (vnodeopv_entry_t) msdosfs_access },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) msdosfs_bmap },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) msdosfs_lookup },
+       { &vop_close_desc,              (vnodeopv_entry_t) msdosfs_close },
+       { &vop_create_desc,             (vnodeopv_entry_t) msdosfs_create },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) msdosfs_fsync },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) msdosfs_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) msdosfs_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_link_desc,               (vnodeopv_entry_t) msdosfs_link },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_mkdir_desc,              (vnodeopv_entry_t) msdosfs_mkdir },
+       { &vop_mknod_desc,              (vnodeopv_entry_t) msdosfs_mknod },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) msdosfs_pathconf },
+       { &vop_print_desc,              (vnodeopv_entry_t) msdosfs_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) msdosfs_read },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) msdosfs_readdir },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) msdosfs_reclaim },
+       { &vop_remove_desc,             (vnodeopv_entry_t) msdosfs_remove },
+       { &vop_rename_desc,             (vnodeopv_entry_t) msdosfs_rename },
+       { &vop_rmdir_desc,              (vnodeopv_entry_t) msdosfs_rmdir },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) msdosfs_setattr },
+       { &vop_strategy_desc,           (vnodeopv_entry_t) msdosfs_strategy },
+       { &vop_symlink_desc,            (vnodeopv_entry_t) msdosfs_symlink },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
+       { &vop_write_desc,              (vnodeopv_entry_t) msdosfs_write },
+       { &vop_getpages_desc,           (vnodeopv_entry_t) msdosfs_getpages },
+       { &vop_putpages_desc,           (vnodeopv_entry_t) msdosfs_putpages },
        { NULL, NULL }
 };
index 6a8ccbb..3f9a22c 100644 (file)
@@ -35,7 +35,7 @@
  *
  *     @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/nfs/nfs_vnops.c,v 1.150.2.5 2001/12/20 19:56:28 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.36 2004/11/12 00:09:37 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.37 2005/02/15 08:32:18 joerg Exp $
  */
 
 
@@ -143,42 +143,42 @@ static    int     nfs_nresolve (struct vop_nresolve_args *);
  */
 struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
-       { &vop_access_desc,             (void *) nfs_access },
-       { &vop_advlock_desc,            (void *) nfs_advlock },
-       { &vop_bmap_desc,               (void *) nfs_bmap },
-       { &vop_bwrite_desc,             (void *) nfs_bwrite },
-       { &vop_close_desc,              (void *) nfs_close },
-       { &vop_create_desc,             (void *) nfs_create },
-       { &vop_fsync_desc,              (void *) nfs_fsync },
-       { &vop_getattr_desc,            (void *) nfs_getattr },
-       { &vop_getpages_desc,           (void *) nfs_getpages },
-       { &vop_putpages_desc,           (void *) nfs_putpages },
-       { &vop_inactive_desc,           (void *) nfs_inactive },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
+       { &vop_access_desc,             (vnodeopv_entry_t) nfs_access },
+       { &vop_advlock_desc,            (vnodeopv_entry_t) nfs_advlock },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) nfs_bmap },
+       { &vop_bwrite_desc,             (vnodeopv_entry_t) nfs_bwrite },
+       { &vop_close_desc,              (vnodeopv_entry_t) nfs_close },
+       { &vop_create_desc,             (vnodeopv_entry_t) nfs_create },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) nfs_fsync },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) nfs_getattr },
+       { &vop_getpages_desc,           (vnodeopv_entry_t) nfs_getpages },
+       { &vop_putpages_desc,           (vnodeopv_entry_t) nfs_putpages },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) nfs_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
        { &vop_lease_desc,              vop_null },
-       { &vop_link_desc,               (void *) nfs_link },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_lookup_desc,             (void *) nfs_lookup },
-       { &vop_mkdir_desc,              (void *) nfs_mkdir },
-       { &vop_mknod_desc,              (void *) nfs_mknod },
-       { &vop_mmap_desc,               (void *) nfs_mmap },
-       { &vop_open_desc,               (void *) nfs_open },
-       { &vop_poll_desc,               (void *) nfs_poll },
-       { &vop_print_desc,              (void *) nfs_print },
-       { &vop_read_desc,               (void *) nfs_read },
-       { &vop_readdir_desc,            (void *) nfs_readdir },
-       { &vop_readlink_desc,           (void *) nfs_readlink },
-       { &vop_reclaim_desc,            (void *) nfs_reclaim },
-       { &vop_remove_desc,             (void *) nfs_remove },
-       { &vop_rename_desc,             (void *) nfs_rename },
-       { &vop_rmdir_desc,              (void *) nfs_rmdir },
-       { &vop_setattr_desc,            (void *) nfs_setattr },
-       { &vop_strategy_desc,           (void *) nfs_strategy },
-       { &vop_symlink_desc,            (void *) nfs_symlink },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
-       { &vop_write_desc,              (void *) nfs_write },
-
-       { &vop_nresolve_desc,           (void *) nfs_nresolve },
+       { &vop_link_desc,               (vnodeopv_entry_t) nfs_link },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) nfs_lookup },
+       { &vop_mkdir_desc,              (vnodeopv_entry_t) nfs_mkdir },
+       { &vop_mknod_desc,              (vnodeopv_entry_t) nfs_mknod },
+       { &vop_mmap_desc,               (vnodeopv_entry_t) nfs_mmap },
+       { &vop_open_desc,               (vnodeopv_entry_t) nfs_open },
+       { &vop_poll_desc,               (vnodeopv_entry_t) nfs_poll },
+       { &vop_print_desc,              (vnodeopv_entry_t) nfs_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) nfs_read },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) nfs_readdir },
+       { &vop_readlink_desc,           (vnodeopv_entry_t) nfs_readlink },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) nfs_reclaim },
+       { &vop_remove_desc,             (vnodeopv_entry_t) nfs_remove },
+       { &vop_rename_desc,             (vnodeopv_entry_t) nfs_rename },
+       { &vop_rmdir_desc,              (vnodeopv_entry_t) nfs_rmdir },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) nfs_setattr },
+       { &vop_strategy_desc,           (vnodeopv_entry_t) nfs_strategy },
+       { &vop_symlink_desc,            (vnodeopv_entry_t) nfs_symlink },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
+       { &vop_write_desc,              (vnodeopv_entry_t) nfs_write },
+
+       { &vop_nresolve_desc,           (vnodeopv_entry_t) nfs_nresolve },
        { NULL, NULL }
 };
 
@@ -186,38 +186,38 @@ struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
  * Special device vnode ops
  */
 struct vnodeopv_entry_desc nfsv2_specop_entries[] = {
-       { &vop_default_desc,            (void *) spec_vnoperate },
-       { &vop_access_desc,             (void *) nfsspec_access },
-       { &vop_close_desc,              (void *) nfsspec_close },
-       { &vop_fsync_desc,              (void *) nfs_fsync },
-       { &vop_getattr_desc,            (void *) nfs_getattr },
-       { &vop_inactive_desc,           (void *) nfs_inactive },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_print_desc,              (void *) nfs_print },
-       { &vop_read_desc,               (void *) nfsspec_read },
-       { &vop_reclaim_desc,            (void *) nfs_reclaim },
-       { &vop_setattr_desc,            (void *) nfs_setattr },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
-       { &vop_write_desc,              (void *) nfsspec_write },
+       { &vop_default_desc,            (vnodeopv_entry_t) spec_vnoperate },
+       { &vop_access_desc,             (vnodeopv_entry_t) nfsspec_access },
+       { &vop_close_desc,              (vnodeopv_entry_t) nfsspec_close },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) nfs_fsync },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) nfs_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) nfs_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_print_desc,              (vnodeopv_entry_t) nfs_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) nfsspec_read },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) nfs_reclaim },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) nfs_setattr },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
+       { &vop_write_desc,              (vnodeopv_entry_t) nfsspec_write },
        { NULL, NULL }
 };
 
 struct vnodeopv_entry_desc nfsv2_fifoop_entries[] = {
-       { &vop_default_desc,            (void *) fifo_vnoperate },
-       { &vop_access_desc,             (void *) nfsspec_access },
-       { &vop_close_desc,              (void *) nfsfifo_close },
-       { &vop_fsync_desc,              (void *) nfs_fsync },
-       { &vop_getattr_desc,            (void *) nfs_getattr },
-       { &vop_inactive_desc,           (void *) nfs_inactive },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_print_desc,              (void *) nfs_print },
-       { &vop_read_desc,               (void *) nfsfifo_read },
-       { &vop_reclaim_desc,            (void *) nfs_reclaim },
-       { &vop_setattr_desc,            (void *) nfs_setattr },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
-       { &vop_write_desc,              (void *) nfsfifo_write },
+       { &vop_default_desc,            (vnodeopv_entry_t) fifo_vnoperate },
+       { &vop_access_desc,             (vnodeopv_entry_t) nfsspec_access },
+       { &vop_close_desc,              (vnodeopv_entry_t) nfsfifo_close },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) nfs_fsync },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) nfs_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) nfs_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_print_desc,              (vnodeopv_entry_t) nfs_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) nfsfifo_read },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) nfs_reclaim },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) nfs_setattr },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
+       { &vop_write_desc,              (vnodeopv_entry_t) nfsfifo_write },
        { NULL, NULL }
 };
 
index 7e36111..610e74c 100644 (file)
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/ntfs/ntfs_vnops.c,v 1.9.2.4 2002/08/06 19:35:18 semenu Exp $
- * $DragonFly: src/sys/vfs/ntfs/ntfs_vnops.c,v 1.21 2005/01/31 21:41:00 joerg Exp $
+ * $DragonFly: src/sys/vfs/ntfs/ntfs_vnops.c,v 1.22 2005/02/15 08:32:18 joerg Exp $
  *
  */
 
@@ -839,30 +839,30 @@ ntfs_pathconf(void *v)
 struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = {
        { &vop_default_desc,    vop_defaultop },
 
-       { &vop_getattr_desc,    (void *)ntfs_getattr },
-       { &vop_inactive_desc,   (void *)ntfs_inactive },
-       { &vop_reclaim_desc,    (void *)ntfs_reclaim },
-       { &vop_print_desc,      (void *)ntfs_print },
-       { &vop_pathconf_desc,   (void *)ntfs_pathconf },
-
-       { &vop_islocked_desc,   (void *)vop_stdislocked },
-       { &vop_unlock_desc,     (void *)vop_stdunlock },
-       { &vop_lock_desc,       (void *)vop_stdlock },
-       { &vop_lookup_desc,     (void *)ntfs_lookup },
-
-       { &vop_access_desc,     (void *)ntfs_access },
-       { &vop_close_desc,      (void *)ntfs_close },
-       { &vop_open_desc,       (void *)ntfs_open },
-       { &vop_readdir_desc,    (void *)ntfs_readdir },
-       { &vop_fsync_desc,      (void *)ntfs_fsync },
-
-       { &vop_bmap_desc,       (void *)ntfs_bmap },
-       { &vop_getpages_desc,   (void *)ntfs_getpages },
-       { &vop_putpages_desc,   (void *)ntfs_putpages },
-       { &vop_strategy_desc,   (void *)ntfs_strategy },
-       { &vop_bwrite_desc,     (void *)vop_stdbwrite },
-       { &vop_read_desc,       (void *)ntfs_read },
-       { &vop_write_desc,      (void *)ntfs_write },
+       { &vop_getattr_desc,    (vnodeopv_entry_t)ntfs_getattr },
+       { &vop_inactive_desc,   (vnodeopv_entry_t)ntfs_inactive },
+       { &vop_reclaim_desc,    (vnodeopv_entry_t)ntfs_reclaim },
+       { &vop_print_desc,      (vnodeopv_entry_t)ntfs_print },
+       { &vop_pathconf_desc,   (vnodeopv_entry_t)ntfs_pathconf },
+
+       { &vop_islocked_desc,   (vnodeopv_entry_t)vop_stdislocked },
+       { &vop_unlock_desc,     (vnodeopv_entry_t)vop_stdunlock },
+       { &vop_lock_desc,       (vnodeopv_entry_t)vop_stdlock },
+       { &vop_lookup_desc,     (vnodeopv_entry_t)ntfs_lookup },
+
+       { &vop_access_desc,     (vnodeopv_entry_t)ntfs_access },
+       { &vop_close_desc,      (vnodeopv_entry_t)ntfs_close },
+       { &vop_open_desc,       (vnodeopv_entry_t)ntfs_open },
+       { &vop_readdir_desc,    (vnodeopv_entry_t)ntfs_readdir },
+       { &vop_fsync_desc,      (vnodeopv_entry_t)ntfs_fsync },
+
+       { &vop_bmap_desc,       (vnodeopv_entry_t)ntfs_bmap },
+       { &vop_getpages_desc,   (vnodeopv_entry_t)ntfs_getpages },
+       { &vop_putpages_desc,   (vnodeopv_entry_t)ntfs_putpages },
+       { &vop_strategy_desc,   (vnodeopv_entry_t)ntfs_strategy },
+       { &vop_bwrite_desc,     (vnodeopv_entry_t)vop_stdbwrite },
+       { &vop_read_desc,       (vnodeopv_entry_t)ntfs_read },
+       { &vop_write_desc,      (vnodeopv_entry_t)ntfs_write },
 
        { NULL, NULL }
 };
index f15b39a..d928efa 100644 (file)
@@ -38,7 +38,7 @@
  * Ancestors:
  *     @(#)lofs_vnops.c        1.2 (Berkeley) 6/18/92
  * $FreeBSD: src/sys/miscfs/nullfs/null_vnops.c,v 1.38.2.6 2002/07/31 00:32:28 semenu Exp $
- * $DragonFly: src/sys/vfs/nullfs/null_vnops.c,v 1.21 2004/12/17 00:18:30 dillon Exp $
+ * $DragonFly: src/sys/vfs/nullfs/null_vnops.c,v 1.22 2005/02/15 08:32:18 joerg Exp $
  *     ...and...
  *     @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
@@ -935,30 +935,30 @@ null_getvobject(struct vop_getvobject_args *ap)
  * Global vfs data structures
  */
 struct vnodeopv_entry_desc null_vnodeop_entries[] = {
-       { &vop_default_desc,            (void *) null_bypass },
-       { &vop_access_desc,             (void *) null_access },
-       { &vop_createvobject_desc,      (void *) null_createvobject },
-       { &vop_destroyvobject_desc,     (void *) null_destroyvobject },
-       { &vop_getattr_desc,            (void *) null_getattr },
-       { &vop_getvobject_desc,         (void *) null_getvobject },
-       { &vop_inactive_desc,           (void *) null_inactive },
-       { &vop_islocked_desc,           (void *) null_islocked },
-       { &vop_lock_desc,               (void *) null_lock },
-       { &vop_lookup_desc,             (void *) null_lookup },
-       { &vop_open_desc,               (void *) null_open },
-       { &vop_print_desc,              (void *) null_print },
-       { &vop_reclaim_desc,            (void *) null_reclaim },
-       { &vop_rename_desc,             (void *) null_rename },
-       { &vop_setattr_desc,            (void *) null_setattr },
-       { &vop_unlock_desc,             (void *) null_unlock },
-       { &vop_revoke_desc,             (void *) null_revoke },
-
-       { &vop_nresolve_desc,           (void *) null_nresolve },
-       { &vop_ncreate_desc,            (void *) null_ncreate },
-       { &vop_nmkdir_desc,             (void *) null_nmkdir },
-       { &vop_nremove_desc,            (void *) null_nremove },
-       { &vop_nrmdir_desc,             (void *) null_nrmdir },
-       { &vop_nrename_desc,            (void *) null_nrename },
+       { &vop_default_desc,            (vnodeopv_entry_t) null_bypass },
+       { &vop_access_desc,             (vnodeopv_entry_t) null_access },
+       { &vop_createvobject_desc,      (vnodeopv_entry_t) null_createvobject },
+       { &vop_destroyvobject_desc,     (vnodeopv_entry_t) null_destroyvobject },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) null_getattr },
+       { &vop_getvobject_desc,         (vnodeopv_entry_t) null_getvobject },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) null_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) null_islocked },
+       { &vop_lock_desc,               (vnodeopv_entry_t) null_lock },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) null_lookup },
+       { &vop_open_desc,               (vnodeopv_entry_t) null_open },
+       { &vop_print_desc,              (vnodeopv_entry_t) null_print },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) null_reclaim },
+       { &vop_rename_desc,             (vnodeopv_entry_t) null_rename },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) null_setattr },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) null_unlock },
+       { &vop_revoke_desc,             (vnodeopv_entry_t) null_revoke },
+
+       { &vop_nresolve_desc,           (vnodeopv_entry_t) null_nresolve },
+       { &vop_ncreate_desc,            (vnodeopv_entry_t) null_ncreate },
+       { &vop_nmkdir_desc,             (vnodeopv_entry_t) null_nmkdir },
+       { &vop_nremove_desc,            (vnodeopv_entry_t) null_nremove },
+       { &vop_nrmdir_desc,             (vnodeopv_entry_t) null_nrmdir },
+       { &vop_nrename_desc,            (vnodeopv_entry_t) null_nrename },
        { NULL, NULL }
 };
 
index b26deea..7e52156 100644 (file)
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/nwfs/nwfs_vnops.c,v 1.6.2.3 2001/03/14 11:26:59 bp Exp $
- * $DragonFly: src/sys/vfs/nwfs/nwfs_vnops.c,v 1.20 2004/11/12 00:09:42 dillon Exp $
+ * $DragonFly: src/sys/vfs/nwfs/nwfs_vnops.c,v 1.21 2005/02/15 08:32:18 joerg Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -86,36 +86,36 @@ static int nwfs_pathconf(struct vop_pathconf_args *ap);
 /* Global vfs data structures for nwfs */
 struct vnodeopv_entry_desc nwfs_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
-       { &vop_access_desc,             (void *) nwfs_access },
-       { &vop_bmap_desc,               (void *) nwfs_bmap },
-       { &vop_open_desc,               (void *) nwfs_open },
-       { &vop_close_desc,              (void *) nwfs_close },
-       { &vop_create_desc,             (void *) nwfs_create },
-       { &vop_fsync_desc,              (void *) nwfs_fsync },
-       { &vop_getattr_desc,            (void *) nwfs_getattr },
-       { &vop_getpages_desc,           (void *) nwfs_getpages },
-       { &vop_putpages_desc,           (void *) nwfs_putpages },
-       { &vop_ioctl_desc,              (void *) nwfs_ioctl },
-       { &vop_inactive_desc,           (void *) nwfs_inactive },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_link_desc,               (void *) nwfs_link },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_lookup_desc,             (void *) nwfs_lookup },
-       { &vop_mkdir_desc,              (void *) nwfs_mkdir },
-       { &vop_mknod_desc,              (void *) nwfs_mknod },
-       { &vop_pathconf_desc,           (void *) nwfs_pathconf },
-       { &vop_print_desc,              (void *) nwfs_print },
-       { &vop_read_desc,               (void *) nwfs_read },
-       { &vop_readdir_desc,            (void *) nwfs_readdir },
-       { &vop_reclaim_desc,            (void *) nwfs_reclaim },
-       { &vop_remove_desc,             (void *) nwfs_remove },
-       { &vop_rename_desc,             (void *) nwfs_rename },
-       { &vop_rmdir_desc,              (void *) nwfs_rmdir },
-       { &vop_setattr_desc,            (void *) nwfs_setattr },
-       { &vop_strategy_desc,           (void *) nwfs_strategy },
-       { &vop_symlink_desc,            (void *) nwfs_symlink },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
-       { &vop_write_desc,              (void *) nwfs_write },
+       { &vop_access_desc,             (vnodeopv_entry_t) nwfs_access },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) nwfs_bmap },
+       { &vop_open_desc,               (vnodeopv_entry_t) nwfs_open },
+       { &vop_close_desc,              (vnodeopv_entry_t) nwfs_close },
+       { &vop_create_desc,             (vnodeopv_entry_t) nwfs_create },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) nwfs_fsync },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) nwfs_getattr },
+       { &vop_getpages_desc,           (vnodeopv_entry_t) nwfs_getpages },
+       { &vop_putpages_desc,           (vnodeopv_entry_t) nwfs_putpages },
+       { &vop_ioctl_desc,              (vnodeopv_entry_t) nwfs_ioctl },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) nwfs_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_link_desc,               (vnodeopv_entry_t) nwfs_link },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) nwfs_lookup },
+       { &vop_mkdir_desc,              (vnodeopv_entry_t) nwfs_mkdir },
+       { &vop_mknod_desc,              (vnodeopv_entry_t) nwfs_mknod },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) nwfs_pathconf },
+       { &vop_print_desc,              (vnodeopv_entry_t) nwfs_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) nwfs_read },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) nwfs_readdir },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) nwfs_reclaim },
+       { &vop_remove_desc,             (vnodeopv_entry_t) nwfs_remove },
+       { &vop_rename_desc,             (vnodeopv_entry_t) nwfs_rename },
+       { &vop_rmdir_desc,              (vnodeopv_entry_t) nwfs_rmdir },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) nwfs_setattr },
+       { &vop_strategy_desc,           (vnodeopv_entry_t) nwfs_strategy },
+       { &vop_symlink_desc,            (vnodeopv_entry_t) nwfs_symlink },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
+       { &vop_write_desc,              (vnodeopv_entry_t) nwfs_write },
        { NULL, NULL }
 };
 
index db88c11..9768da7 100644 (file)
@@ -36,7 +36,7 @@
  *     @(#)portal_vnops.c      8.14 (Berkeley) 5/21/95
  *
  * $FreeBSD: src/sys/miscfs/portal/portal_vnops.c,v 1.38 1999/12/21 06:29:00 chris Exp $
- * $DragonFly: src/sys/vfs/portal/portal_vnops.c,v 1.18 2004/12/17 00:18:33 dillon Exp $
+ * $DragonFly: src/sys/vfs/portal/portal_vnops.c,v 1.19 2005/02/15 08:32:18 joerg Exp $
  */
 
 /*
@@ -569,16 +569,16 @@ portal_badop(void)
 struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
        { &vop_access_desc,             vop_null },
-       { &vop_bmap_desc,               (void *) portal_badop },
-       { &vop_getattr_desc,            (void *) portal_getattr },
-       { &vop_inactive_desc,           (void *) portal_inactive },
-       { &vop_lookup_desc,             (void *) portal_lookup },
-       { &vop_open_desc,               (void *) portal_open },
-       { &vop_pathconf_desc,           (void *) vop_stdpathconf },
-       { &vop_print_desc,              (void *) portal_print },
-       { &vop_readdir_desc,            (void *) portal_readdir },
-       { &vop_reclaim_desc,            (void *) portal_reclaim },
-       { &vop_setattr_desc,            (void *) portal_setattr },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) portal_badop },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) portal_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) portal_inactive },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) portal_lookup },
+       { &vop_open_desc,               (vnodeopv_entry_t) portal_open },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) vop_stdpathconf },
+       { &vop_print_desc,              (vnodeopv_entry_t) portal_print },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) portal_readdir },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) portal_reclaim },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) portal_setattr },
        { NULL, NULL }
 };
 
index 54215d8..9f95e69 100644 (file)
@@ -37,7 +37,7 @@
  *     @(#)procfs_vnops.c      8.18 (Berkeley) 5/21/95
  *
  * $FreeBSD: src/sys/miscfs/procfs/procfs_vnops.c,v 1.76.2.7 2002/01/22 17:22:59 nectar Exp $
- * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.22 2004/11/12 00:09:47 dillon Exp $
+ * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.23 2005/02/15 08:32:18 joerg Exp $
  */
 
 /*
@@ -1007,31 +1007,31 @@ atopid(const char *b, u_int len)
  */
 struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
-       { &vop_access_desc,             (void *) procfs_access },
-       { &vop_advlock_desc,            (void *) procfs_badop },
-       { &vop_bmap_desc,               (void *) procfs_bmap },
-       { &vop_close_desc,              (void *) procfs_close },
-       { &vop_create_desc,             (void *) procfs_badop },
-       { &vop_getattr_desc,            (void *) procfs_getattr },
-       { &vop_inactive_desc,           (void *) procfs_inactive },
-       { &vop_link_desc,               (void *) procfs_badop },
-       { &vop_lookup_desc,             (void *) procfs_lookup },
-       { &vop_mkdir_desc,              (void *) procfs_badop },
-       { &vop_mknod_desc,              (void *) procfs_badop },
-       { &vop_open_desc,               (void *) procfs_open },
-       { &vop_pathconf_desc,           (void *) vop_stdpathconf },
-       { &vop_print_desc,              (void *) procfs_print },
-       { &vop_read_desc,               (void *) procfs_rw },
-       { &vop_readdir_desc,            (void *) procfs_readdir },
-       { &vop_readlink_desc,           (void *) procfs_readlink },
-       { &vop_reclaim_desc,            (void *) procfs_reclaim },
-       { &vop_remove_desc,             (void *) procfs_badop },
-       { &vop_rename_desc,             (void *) procfs_badop },
-       { &vop_rmdir_desc,              (void *) procfs_badop },
-       { &vop_setattr_desc,            (void *) procfs_setattr },
-       { &vop_symlink_desc,            (void *) procfs_badop },
-       { &vop_write_desc,              (void *) procfs_rw },
-       { &vop_ioctl_desc,              (void *) procfs_ioctl },
+       { &vop_access_desc,             (vnodeopv_entry_t) procfs_access },
+       { &vop_advlock_desc,            (vnodeopv_entry_t) procfs_badop },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) procfs_bmap },
+       { &vop_close_desc,              (vnodeopv_entry_t) procfs_close },
+       { &vop_create_desc,             (vnodeopv_entry_t) procfs_badop },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) procfs_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) procfs_inactive },
+       { &vop_link_desc,               (vnodeopv_entry_t) procfs_badop },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) procfs_lookup },
+       { &vop_mkdir_desc,              (vnodeopv_entry_t) procfs_badop },
+       { &vop_mknod_desc,              (vnodeopv_entry_t) procfs_badop },
+       { &vop_open_desc,               (vnodeopv_entry_t) procfs_open },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) vop_stdpathconf },
+       { &vop_print_desc,              (vnodeopv_entry_t) procfs_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) procfs_rw },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) procfs_readdir },
+       { &vop_readlink_desc,           (vnodeopv_entry_t) procfs_readlink },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) procfs_reclaim },
+       { &vop_remove_desc,             (vnodeopv_entry_t) procfs_badop },
+       { &vop_rename_desc,             (vnodeopv_entry_t) procfs_badop },
+       { &vop_rmdir_desc,              (vnodeopv_entry_t) procfs_badop },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) procfs_setattr },
+       { &vop_symlink_desc,            (vnodeopv_entry_t) procfs_badop },
+       { &vop_write_desc,              (vnodeopv_entry_t) procfs_rw },
+       { &vop_ioctl_desc,              (vnodeopv_entry_t) procfs_ioctl },
        { NULL, NULL }
 };
 
index 6a28a3c..55e8659 100644 (file)
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.2.2.8 2003/04/04 08:57:23 tjr Exp $
- * $DragonFly: src/sys/vfs/smbfs/smbfs_vnops.c,v 1.21 2004/11/12 00:09:48 dillon Exp $
+ * $DragonFly: src/sys/vfs/smbfs/smbfs_vnops.c,v 1.22 2005/02/15 08:32:18 joerg Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,39 +88,39 @@ static int smbfs_getextattr(struct vop_getextattr_args *ap);
 
 struct vnodeopv_entry_desc smbfs_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
-       { &vop_access_desc,             (void *) smbfs_access },
-       { &vop_advlock_desc,            (void *) smbfs_advlock },
-       { &vop_bmap_desc,               (void *) smbfs_bmap },
-       { &vop_close_desc,              (void *) smbfs_closel },
-       { &vop_create_desc,             (void *) smbfs_create },
-       { &vop_fsync_desc,              (void *) smbfs_fsync },
-       { &vop_getattr_desc,            (void *) smbfs_getattr },
-       { &vop_getpages_desc,           (void *) smbfs_getpages },
-       { &vop_inactive_desc,           (void *) smbfs_inactive },
-       { &vop_ioctl_desc,              (void *) smbfs_ioctl },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_link_desc,               (void *) smbfs_link },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_lookup_desc,             (void *) smbfs_lookup },
-       { &vop_mkdir_desc,              (void *) smbfs_mkdir },
-       { &vop_mknod_desc,              (void *) smbfs_mknod },
-       { &vop_open_desc,               (void *) smbfs_open },
-       { &vop_pathconf_desc,           (void *) smbfs_pathconf },
-       { &vop_print_desc,              (void *) smbfs_print },
-       { &vop_putpages_desc,           (void *) smbfs_putpages },
-       { &vop_read_desc,               (void *) smbfs_read },
-       { &vop_readdir_desc,            (void *) smbfs_readdir },
-       { &vop_reclaim_desc,            (void *) smbfs_reclaim },
-       { &vop_remove_desc,             (void *) smbfs_remove },
-       { &vop_rename_desc,             (void *) smbfs_rename },
-       { &vop_rmdir_desc,              (void *) smbfs_rmdir },
-       { &vop_setattr_desc,            (void *) smbfs_setattr },
-       { &vop_strategy_desc,           (void *) smbfs_strategy },
-       { &vop_symlink_desc,            (void *) smbfs_symlink },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
-       { &vop_write_desc,              (void *) smbfs_write },
-       { &vop_getextattr_desc,         (void *) smbfs_getextattr },
-/*     { &vop_setextattr_desc,         (void *) smbfs_setextattr },*/
+       { &vop_access_desc,             (vnodeopv_entry_t) smbfs_access },
+       { &vop_advlock_desc,            (vnodeopv_entry_t) smbfs_advlock },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) smbfs_bmap },
+       { &vop_close_desc,              (vnodeopv_entry_t) smbfs_closel },
+       { &vop_create_desc,             (vnodeopv_entry_t) smbfs_create },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) smbfs_fsync },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) smbfs_getattr },
+       { &vop_getpages_desc,           (vnodeopv_entry_t) smbfs_getpages },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) smbfs_inactive },
+       { &vop_ioctl_desc,              (vnodeopv_entry_t) smbfs_ioctl },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_link_desc,               (vnodeopv_entry_t) smbfs_link },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) smbfs_lookup },
+       { &vop_mkdir_desc,              (vnodeopv_entry_t) smbfs_mkdir },
+       { &vop_mknod_desc,              (vnodeopv_entry_t) smbfs_mknod },
+       { &vop_open_desc,               (vnodeopv_entry_t) smbfs_open },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) smbfs_pathconf },
+       { &vop_print_desc,              (vnodeopv_entry_t) smbfs_print },
+       { &vop_putpages_desc,           (vnodeopv_entry_t) smbfs_putpages },
+       { &vop_read_desc,               (vnodeopv_entry_t) smbfs_read },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) smbfs_readdir },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) smbfs_reclaim },
+       { &vop_remove_desc,             (vnodeopv_entry_t) smbfs_remove },
+       { &vop_rename_desc,             (vnodeopv_entry_t) smbfs_rename },
+       { &vop_rmdir_desc,              (vnodeopv_entry_t) smbfs_rmdir },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) smbfs_setattr },
+       { &vop_strategy_desc,           (vnodeopv_entry_t) smbfs_strategy },
+       { &vop_symlink_desc,            (vnodeopv_entry_t) smbfs_symlink },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
+       { &vop_write_desc,              (vnodeopv_entry_t) smbfs_write },
+       { &vop_getextattr_desc,         (vnodeopv_entry_t) smbfs_getextattr },
+/*     { &vop_setextattr_desc,         (vnodeopv_entry_t) smbfs_setextattr },*/
        { NULL, NULL }
 };
 
index f0966a0..55691e2 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)spec_vnops.c        8.14 (Berkeley) 5/21/95
  * $FreeBSD: src/sys/miscfs/specfs/spec_vnops.c,v 1.131.2.4 2001/02/26 04:23:20 jlemon Exp $
- * $DragonFly: src/sys/vfs/specfs/spec_vnops.c,v 1.22 2004/11/12 00:09:50 dillon Exp $
+ * $DragonFly: src/sys/vfs/specfs/spec_vnops.c,v 1.23 2005/02/15 08:32:18 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -76,25 +76,25 @@ struct vop_ops *spec_vnode_vops;
 struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
        { &vop_access_desc,             vop_ebadf },
-       { &vop_advlock_desc,            (void *) spec_advlock },
-       { &vop_bmap_desc,               (void *) spec_bmap },
-       { &vop_close_desc,              (void *) spec_close },
+       { &vop_advlock_desc,            (vnodeopv_entry_t) spec_advlock },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) spec_bmap },
+       { &vop_close_desc,              (vnodeopv_entry_t) spec_close },
        { &vop_create_desc,             vop_panic },
-       { &vop_freeblks_desc,           (void *) spec_freeblks },
-       { &vop_fsync_desc,              (void *) spec_fsync },
-       { &vop_getpages_desc,           (void *) spec_getpages },
-       { &vop_inactive_desc,           (void *) spec_inactive },
-       { &vop_ioctl_desc,              (void *) spec_ioctl },
+       { &vop_freeblks_desc,           (vnodeopv_entry_t) spec_freeblks },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) spec_fsync },
+       { &vop_getpages_desc,           (vnodeopv_entry_t) spec_getpages },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) spec_inactive },
+       { &vop_ioctl_desc,              (vnodeopv_entry_t) spec_ioctl },
        { &vop_lease_desc,              vop_null },
        { &vop_link_desc,               vop_panic },
        { &vop_mkdir_desc,              vop_panic },
        { &vop_mknod_desc,              vop_panic },
-       { &vop_open_desc,               (void *) spec_open },
-       { &vop_pathconf_desc,           (void *) vop_stdpathconf },
-       { &vop_poll_desc,               (void *) spec_poll },
-       { &vop_kqfilter_desc,           (void *) spec_kqfilter },
-       { &vop_print_desc,              (void *) spec_print },
-       { &vop_read_desc,               (void *) spec_read },
+       { &vop_open_desc,               (vnodeopv_entry_t) spec_open },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) vop_stdpathconf },
+       { &vop_poll_desc,               (vnodeopv_entry_t) spec_poll },
+       { &vop_kqfilter_desc,           (vnodeopv_entry_t) spec_kqfilter },
+       { &vop_print_desc,              (vnodeopv_entry_t) spec_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) spec_read },
        { &vop_readdir_desc,            vop_panic },
        { &vop_readlink_desc,           vop_panic },
        { &vop_reallocblks_desc,        vop_panic },
@@ -103,9 +103,9 @@ struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
        { &vop_rename_desc,             vop_panic },
        { &vop_rmdir_desc,              vop_panic },
        { &vop_setattr_desc,            vop_ebadf },
-       { &vop_strategy_desc,           (void *) spec_strategy },
+       { &vop_strategy_desc,           (vnodeopv_entry_t) spec_strategy },
        { &vop_symlink_desc,            vop_panic },
-       { &vop_write_desc,              (void *) spec_write },
+       { &vop_write_desc,              (vnodeopv_entry_t) spec_write },
        { NULL, NULL }
 };
 static struct vnodeopv_desc spec_vnodeop_opv_desc =
index f754c5c..3c09895 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.33 2003/12/07 05:04:49 scottl Exp $
- * $DragonFly: src/sys/vfs/udf/udf_vnops.c,v 1.11 2004/12/17 00:18:36 dillon Exp $
+ * $DragonFly: src/sys/vfs/udf/udf_vnops.c,v 1.12 2005/02/15 08:32:18 joerg Exp $
  */
 
 /* udf_vnops.c */
@@ -66,17 +66,17 @@ static int udf_bmap_internal(struct udf_node *, uint32_t, daddr_t *, uint32_t *)
 
 struct vnodeopv_entry_desc udf_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
-       { &vop_access_desc,             (void *) udf_access },
-       { &vop_bmap_desc,               (void *) udf_bmap },
-       { &vop_lookup_desc,             (void *) udf_lookup },
-       { &vop_getattr_desc,            (void *) udf_getattr },
-       { &vop_ioctl_desc,              (void *) udf_ioctl },
-       { &vop_pathconf_desc,           (void *) udf_pathconf },
-       { &vop_read_desc,               (void *) udf_read },
-       { &vop_readdir_desc,            (void *) udf_readdir },
-       { &vop_readlink_desc,           (void *) udf_readlink },
-       { &vop_reclaim_desc,            (void *) udf_reclaim },
-       { &vop_strategy_desc,           (void *) udf_strategy },
+       { &vop_access_desc,             (vnodeopv_entry_t) udf_access },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) udf_bmap },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) udf_lookup },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) udf_getattr },
+       { &vop_ioctl_desc,              (vnodeopv_entry_t) udf_ioctl },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) udf_pathconf },
+       { &vop_read_desc,               (vnodeopv_entry_t) udf_read },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) udf_readdir },
+       { &vop_readlink_desc,           (vnodeopv_entry_t) udf_readlink },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) udf_reclaim },
+       { &vop_strategy_desc,           (vnodeopv_entry_t) udf_strategy },
        { NULL, NULL }
 };
 
index 99099cb..2fddb87 100644 (file)
@@ -32,7 +32,7 @@
  *
  *     @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95
  * $FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.64 2000/01/10 12:04:25 phk Exp $
- * $DragonFly: src/sys/vfs/ufs/ffs_vnops.c,v 1.11 2004/08/24 14:01:57 drhodus Exp $
+ * $DragonFly: src/sys/vfs/ufs/ffs_vnops.c,v 1.12 2005/02/15 08:32:18 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -72,26 +72,26 @@ static int  ffs_write (struct vop_write_args *);
 
 /* Global vfs data structures for ufs. */
 struct vnodeopv_entry_desc ffs_vnodeop_entries[] = {
-       { &vop_default_desc,            (void *) ufs_vnoperate },
-       { &vop_fsync_desc,              (void *) ffs_fsync },
-       { &vop_getpages_desc,           (void *) ffs_getpages },
-       { &vop_putpages_desc,           (void *) ffs_putpages },
-       { &vop_read_desc,               (void *) ffs_read },
-       { &vop_balloc_desc,             (void *) ffs_balloc },
-       { &vop_reallocblks_desc,        (void *) ffs_reallocblks },
-       { &vop_write_desc,              (void *) ffs_write },
+       { &vop_default_desc,            (vnodeopv_entry_t) ufs_vnoperate },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) ffs_fsync },
+       { &vop_getpages_desc,           (vnodeopv_entry_t) ffs_getpages },
+       { &vop_putpages_desc,           (vnodeopv_entry_t) ffs_putpages },
+       { &vop_read_desc,               (vnodeopv_entry_t) ffs_read },
+       { &vop_balloc_desc,             (vnodeopv_entry_t) ffs_balloc },
+       { &vop_reallocblks_desc,        (vnodeopv_entry_t) ffs_reallocblks },
+       { &vop_write_desc,              (vnodeopv_entry_t) ffs_write },
        { NULL, NULL }
 };
 
 struct vnodeopv_entry_desc ffs_specop_entries[] = {
-       { &vop_default_desc,            (void *) ufs_vnoperatespec },
-       { &vop_fsync_desc,              (void *) ffs_fsync },
+       { &vop_default_desc,            (vnodeopv_entry_t) ufs_vnoperatespec },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) ffs_fsync },
        { NULL, NULL }
 };
 
 struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
-       { &vop_default_desc,            (void *) ufs_vnoperatefifo },
-       { &vop_fsync_desc,              (void *) ffs_fsync },
+       { &vop_default_desc,            (vnodeopv_entry_t) ufs_vnoperatefifo },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) ffs_fsync },
        { NULL, NULL }
 };
 
index 7d98efe..a6f71d2 100644 (file)
@@ -37,7 +37,7 @@
  *
  *     @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.131.2.8 2003/01/02 17:26:19 bde Exp $
- * $DragonFly: src/sys/vfs/ufs/ufs_vnops.c,v 1.25 2004/12/17 00:18:44 dillon Exp $
+ * $DragonFly: src/sys/vfs/ufs/ufs_vnops.c,v 1.26 2005/02/15 08:32:18 joerg Exp $
  */
 
 #include "opt_quota.h"
@@ -2266,40 +2266,40 @@ filt_ufsvnode(struct knote *kn, long hint)
 static struct vop_ops *ufs_vnode_vops;
 static struct vnodeopv_entry_desc ufs_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
-       { &vop_fsync_desc,              (void *) ufs_missingop },
-       { &vop_read_desc,               (void *) ufs_missingop },
-       { &vop_reallocblks_desc,        (void *) ufs_missingop },
-       { &vop_write_desc,              (void *) ufs_missingop },
-       { &vop_access_desc,             (void *) ufs_access },
-       { &vop_advlock_desc,            (void *) ufs_advlock },
-       { &vop_bmap_desc,               (void *) ufs_bmap },
-       { &vop_lookup_desc,             (void *) ufs_lookup },
-       { &vop_close_desc,              (void *) ufs_close },
-       { &vop_create_desc,             (void *) ufs_create },
-       { &vop_getattr_desc,            (void *) ufs_getattr },
-       { &vop_inactive_desc,           (void *) ufs_inactive },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_link_desc,               (void *) ufs_link },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_mkdir_desc,              (void *) ufs_mkdir },
-       { &vop_mknod_desc,              (void *) ufs_mknod },
-       { &vop_mmap_desc,               (void *) ufs_mmap },
-       { &vop_open_desc,               (void *) ufs_open },
-       { &vop_pathconf_desc,           (void *) ufs_pathconf },
-       { &vop_poll_desc,               (void *) vop_stdpoll },
-       { &vop_kqfilter_desc,           (void *) ufs_kqfilter },
-       { &vop_print_desc,              (void *) ufs_print },
-       { &vop_readdir_desc,            (void *) ufs_readdir },
-       { &vop_readlink_desc,           (void *) ufs_readlink },
-       { &vop_reclaim_desc,            (void *) ufs_reclaim },
-       { &vop_remove_desc,             (void *) ufs_remove },
-       { &vop_rename_desc,             (void *) ufs_rename },
-       { &vop_rmdir_desc,              (void *) ufs_rmdir },
-       { &vop_setattr_desc,            (void *) ufs_setattr },
-       { &vop_strategy_desc,           (void *) ufs_strategy },
-       { &vop_symlink_desc,            (void *) ufs_symlink },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
-       { &vop_whiteout_desc,           (void *) ufs_whiteout },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) ufs_missingop },
+       { &vop_read_desc,               (vnodeopv_entry_t) ufs_missingop },
+       { &vop_reallocblks_desc,        (vnodeopv_entry_t) ufs_missingop },
+       { &vop_write_desc,              (vnodeopv_entry_t) ufs_missingop },
+       { &vop_access_desc,             (vnodeopv_entry_t) ufs_access },
+       { &vop_advlock_desc,            (vnodeopv_entry_t) ufs_advlock },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) ufs_bmap },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) ufs_lookup },
+       { &vop_close_desc,              (vnodeopv_entry_t) ufs_close },
+       { &vop_create_desc,             (vnodeopv_entry_t) ufs_create },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) ufs_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) ufs_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_link_desc,               (vnodeopv_entry_t) ufs_link },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_mkdir_desc,              (vnodeopv_entry_t) ufs_mkdir },
+       { &vop_mknod_desc,              (vnodeopv_entry_t) ufs_mknod },
+       { &vop_mmap_desc,               (vnodeopv_entry_t) ufs_mmap },
+       { &vop_open_desc,               (vnodeopv_entry_t) ufs_open },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) ufs_pathconf },
+       { &vop_poll_desc,               (vnodeopv_entry_t) vop_stdpoll },
+       { &vop_kqfilter_desc,           (vnodeopv_entry_t) ufs_kqfilter },
+       { &vop_print_desc,              (vnodeopv_entry_t) ufs_print },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) ufs_readdir },
+       { &vop_readlink_desc,           (vnodeopv_entry_t) ufs_readlink },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) ufs_reclaim },
+       { &vop_remove_desc,             (vnodeopv_entry_t) ufs_remove },
+       { &vop_rename_desc,             (vnodeopv_entry_t) ufs_rename },
+       { &vop_rmdir_desc,              (vnodeopv_entry_t) ufs_rmdir },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) ufs_setattr },
+       { &vop_strategy_desc,           (vnodeopv_entry_t) ufs_strategy },
+       { &vop_symlink_desc,            (vnodeopv_entry_t) ufs_symlink },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
+       { &vop_whiteout_desc,           (vnodeopv_entry_t) ufs_whiteout },
        { NULL, NULL }
 };
 static struct vnodeopv_desc ufs_vnodeop_opv_desc =
@@ -2307,20 +2307,20 @@ static struct vnodeopv_desc ufs_vnodeop_opv_desc =
 
 static struct vop_ops *ufs_spec_vops;
 static struct vnodeopv_entry_desc ufs_specop_entries[] = {
-       { &vop_default_desc,            (void *) spec_vnoperate },
-       { &vop_fsync_desc,              (void *) ufs_missingop },
-       { &vop_access_desc,             (void *) ufs_access },
-       { &vop_close_desc,              (void *) ufsspec_close },
-       { &vop_getattr_desc,            (void *) ufs_getattr },
-       { &vop_inactive_desc,           (void *) ufs_inactive },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_print_desc,              (void *) ufs_print },
-       { &vop_read_desc,               (void *) ufsspec_read },
-       { &vop_reclaim_desc,            (void *) ufs_reclaim },
-       { &vop_setattr_desc,            (void *) ufs_setattr },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
-       { &vop_write_desc,              (void *) ufsspec_write },
+       { &vop_default_desc,            (vnodeopv_entry_t) spec_vnoperate },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) ufs_missingop },
+       { &vop_access_desc,             (vnodeopv_entry_t) ufs_access },
+       { &vop_close_desc,              (vnodeopv_entry_t) ufsspec_close },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) ufs_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) ufs_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_print_desc,              (vnodeopv_entry_t) ufs_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) ufsspec_read },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) ufs_reclaim },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) ufs_setattr },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
+       { &vop_write_desc,              (vnodeopv_entry_t) ufsspec_write },
        { NULL, NULL }
 };
 static struct vnodeopv_desc ufs_specop_opv_desc =
@@ -2328,21 +2328,21 @@ static struct vnodeopv_desc ufs_specop_opv_desc =
 
 static struct vop_ops *ufs_fifo_vops;
 static struct vnodeopv_entry_desc ufs_fifoop_entries[] = {
-       { &vop_default_desc,            (void *) fifo_vnoperate },
-       { &vop_fsync_desc,              (void *) ufs_missingop },
-       { &vop_access_desc,             (void *) ufs_access },
-       { &vop_close_desc,              (void *) ufsfifo_close },
-       { &vop_getattr_desc,            (void *) ufs_getattr },
-       { &vop_inactive_desc,           (void *) ufs_inactive },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_kqfilter_desc,           (void *) ufsfifo_kqfilter },
-       { &vop_lock_desc,               (void *) vop_stdlock },
-       { &vop_print_desc,              (void *) ufs_print },
-       { &vop_read_desc,               (void *) ufsfifo_read },
-       { &vop_reclaim_desc,            (void *) ufs_reclaim },
-       { &vop_setattr_desc,            (void *) ufs_setattr },
-       { &vop_unlock_desc,             (void *) vop_stdunlock },
-       { &vop_write_desc,              (void *) ufsfifo_write },
+       { &vop_default_desc,            (vnodeopv_entry_t) fifo_vnoperate },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) ufs_missingop },
+       { &vop_access_desc,             (vnodeopv_entry_t) ufs_access },
+       { &vop_close_desc,              (vnodeopv_entry_t) ufsfifo_close },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) ufs_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) ufs_inactive },
+       { &vop_islocked_desc,           (vnodeopv_entry_t) vop_stdislocked },
+       { &vop_kqfilter_desc,           (vnodeopv_entry_t) ufsfifo_kqfilter },
+       { &vop_lock_desc,               (vnodeopv_entry_t) vop_stdlock },
+       { &vop_print_desc,              (vnodeopv_entry_t) ufs_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) ufsfifo_read },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) ufs_reclaim },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) ufs_setattr },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) vop_stdunlock },
+       { &vop_write_desc,              (vnodeopv_entry_t) ufsfifo_write },
        { NULL, NULL }
 };
 static struct vnodeopv_desc ufs_fifoop_opv_desc =
index 5a0c9a5..e8978a3 100644 (file)
@@ -35,7 +35,7 @@
  *
  *     @(#)umap_vnops.c        8.6 (Berkeley) 5/22/95
  * $FreeBSD: src/sys/miscfs/umapfs/umap_vnops.c,v 1.30 1999/08/30 07:08:04 bde Exp $
- * $DragonFly: src/sys/vfs/umapfs/Attic/umap_vnops.c,v 1.13 2004/12/17 00:18:46 dillon Exp $
+ * $DragonFly: src/sys/vfs/umapfs/Attic/umap_vnops.c,v 1.14 2005/02/15 08:32:19 joerg Exp $
  */
 
 /*
@@ -482,14 +482,14 @@ umap_rename(struct vop_rename_args *ap)
  *
  */
 struct vnodeopv_entry_desc umap_vnodeop_entries[] = {
-       { &vop_default_desc,            (void *) umap_bypass },
-       { &vop_getattr_desc,            (void *) umap_getattr },
-       { &vop_inactive_desc,           (void *) umap_inactive },
-       { &vop_lock_desc,               (void *) umap_lock },
-       { &vop_print_desc,              (void *) umap_print },
-       { &vop_reclaim_desc,            (void *) umap_reclaim },
-       { &vop_rename_desc,             (void *) umap_rename },
-       { &vop_unlock_desc,             (void *) umap_unlock },
+       { &vop_default_desc,            (vnodeopv_entry_t) umap_bypass },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) umap_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) umap_inactive },
+       { &vop_lock_desc,               (vnodeopv_entry_t) umap_lock },
+       { &vop_print_desc,              (vnodeopv_entry_t) umap_print },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) umap_reclaim },
+       { &vop_rename_desc,             (vnodeopv_entry_t) umap_rename },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) umap_unlock },
        { NULL, NULL }
 };
 
index 88fcb21..f58e1f7 100644 (file)
@@ -36,7 +36,7 @@
  *
  *     @(#)union_vnops.c       8.32 (Berkeley) 6/23/95
  * $FreeBSD: src/sys/miscfs/union/union_vnops.c,v 1.72 1999/12/15 23:02:14 eivind Exp $
- * $DragonFly: src/sys/vfs/union/union_vnops.c,v 1.18 2004/12/17 00:18:47 dillon Exp $
+ * $DragonFly: src/sys/vfs/union/union_vnops.c,v 1.19 2005/02/15 08:32:19 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -1861,43 +1861,43 @@ union_strategy(struct vop_strategy_args *ap)
  */
 struct vnodeopv_entry_desc union_vnodeop_entries[] = {
        { &vop_default_desc,            vop_defaultop },
-       { &vop_access_desc,             (void *) union_access },
-       { &vop_advlock_desc,            (void *) union_advlock },
-       { &vop_bmap_desc,               (void *) union_bmap },
-       { &vop_close_desc,              (void *) union_close },
-       { &vop_create_desc,             (void *) union_create },
-       { &vop_fsync_desc,              (void *) union_fsync },
-       { &vop_getpages_desc,           (void *) union_getpages },
-       { &vop_putpages_desc,           (void *) union_putpages },
-       { &vop_getattr_desc,            (void *) union_getattr },
-       { &vop_inactive_desc,           (void *) union_inactive },
-       { &vop_ioctl_desc,              (void *) union_ioctl },
-       { &vop_islocked_desc,           (void *) vop_stdislocked },
-       { &vop_lease_desc,              (void *) union_lease },
-       { &vop_link_desc,               (void *) union_link },
-       { &vop_lock_desc,               (void *) union_lock },
-       { &vop_lookup_desc,             (void *) union_lookup },
-       { &vop_mkdir_desc,              (void *) union_mkdir },
-       { &vop_mknod_desc,              (void *) union_mknod },
-       { &vop_mmap_desc,               (void *) union_mmap },
-       { &vop_open_desc,               (void *) union_open },
-       { &vop_pathconf_desc,           (void *) union_pathconf },
-       { &vop_poll_desc,               (void *) union_poll },
-       { &vop_print_desc,              (void *) union_print },
-       { &vop_read_desc,               (void *) union_read },
-       { &vop_readdir_desc,            (void *) union_readdir },
-       { &vop_readlink_desc,           (void *) union_readlink },
-       { &vop_reclaim_desc,            (void *) union_reclaim },
-       { &vop_remove_desc,             (void *) union_remove },
-       { &vop_rename_desc,             (void *) union_rename },
-       { &vop_revoke_desc,             (void *) union_revoke },
-       { &vop_rmdir_desc,              (void *) union_rmdir },
-       { &vop_setattr_desc,            (void *) union_setattr },
-       { &vop_strategy_desc,           (void *) union_strategy },
-       { &vop_symlink_desc,            (void *) union_symlink },
-       { &vop_unlock_desc,             (void *) union_unlock },
-       { &vop_whiteout_desc,           (void *) union_whiteout },
-       { &vop_write_desc,              (void *) union_write },
+       { &vop_access_desc,             (vnodeopv_entry_t) union_access },
+       { &vop_advlock_desc,            (vnodeopv_entry_t) union_advlock },
+       { &vop_bmap_desc,               (vnodeopv_entry_t) union_bmap },
+       { &vop_close_desc,              (vnodeopv_entry_t) union_close },
+       { &vop_create_desc,             (vnodeopv_entry_t) union_create },
+       { &vop_fsync_desc,              (vnodeopv_entry_t) union_fsync },
+       { &vop_getpages_desc,           (vnodeopv_entry_t) union_getpages },
+       { &vop_putpages_desc,           (vnodeopv_entry_t) union_putpages },
+       { &vop_getattr_desc,            (vnodeopv_entry_t) union_getattr },
+       { &vop_inactive_desc,           (vnodeopv_entry_t) union_inactive },
+       { &vop_ioctl_desc,              (vnodeopv_entry_t) union_ioctl },
+       { &vop_islocked_desc,           vop_stdislocked },
+       { &vop_lease_desc,              (vnodeopv_entry_t) union_lease },
+       { &vop_link_desc,               (vnodeopv_entry_t) union_link },
+       { &vop_lock_desc,               (vnodeopv_entry_t) union_lock },
+       { &vop_lookup_desc,             (vnodeopv_entry_t) union_lookup },
+       { &vop_mkdir_desc,              (vnodeopv_entry_t) union_mkdir },
+       { &vop_mknod_desc,              (vnodeopv_entry_t) union_mknod },
+       { &vop_mmap_desc,               (vnodeopv_entry_t) union_mmap },
+       { &vop_open_desc,               (vnodeopv_entry_t) union_open },
+       { &vop_pathconf_desc,           (vnodeopv_entry_t) union_pathconf },
+       { &vop_poll_desc,               (vnodeopv_entry_t) union_poll },
+       { &vop_print_desc,              (vnodeopv_entry_t) union_print },
+       { &vop_read_desc,               (vnodeopv_entry_t) union_read },
+       { &vop_readdir_desc,            (vnodeopv_entry_t) union_readdir },
+       { &vop_readlink_desc,           (vnodeopv_entry_t) union_readlink },
+       { &vop_reclaim_desc,            (vnodeopv_entry_t) union_reclaim },
+       { &vop_remove_desc,             (vnodeopv_entry_t) union_remove },
+       { &vop_rename_desc,             (vnodeopv_entry_t) union_rename },
+       { &vop_revoke_desc,             (vnodeopv_entry_t) union_revoke },
+       { &vop_rmdir_desc,              (vnodeopv_entry_t) union_rmdir },
+       { &vop_setattr_desc,            (vnodeopv_entry_t) union_setattr },
+       { &vop_strategy_desc,           (vnodeopv_entry_t) union_strategy },
+       { &vop_symlink_desc,            (vnodeopv_entry_t) union_symlink },
+       { &vop_unlock_desc,             (vnodeopv_entry_t) union_unlock },
+       { &vop_whiteout_desc,           (vnodeopv_entry_t) union_whiteout },
+       { &vop_write_desc,              (vnodeopv_entry_t) union_write },
        { NULL, NULL }
 };