]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/miscfs/devfs/devfs_fdesc_support.c
xnu-6153.11.26.tar.gz
[apple/xnu.git] / bsd / miscfs / devfs / devfs_fdesc_support.c
index 28806babebfd40311ae356586413874dc3ade019..b83108b525a10387828dd345a92969d705a43aba 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2019 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -736,45 +736,45 @@ fdesc_badop(void)
 #define fdesc_blockmap (int (*) (struct  vnop_blockmap_args *))eopnotsupp
 
 int(**fdesc_vnodeop_p)(void *);
-struct vnodeopv_entry_desc devfs_fdesc_vnodeop_entries[] = {
-       { &vnop_default_desc, (VOPFUNC)vn_default_error },
-       { &vnop_lookup_desc, (VOPFUNC)vn_default_error},        /* lookup */
-       { &vnop_create_desc, (VOPFUNC)fdesc_create },   /* create */
-       { &vnop_mknod_desc, (VOPFUNC)fdesc_mknod },     /* mknod */
-       { &vnop_open_desc, (VOPFUNC)fdesc_open },       /* open */
-       { &vnop_close_desc, (VOPFUNC)fdesc_close },     /* close */
-       { &vnop_access_desc, (VOPFUNC)fdesc_access },   /* access */
-       { &vnop_getattr_desc, (VOPFUNC)fdesc_getattr }, /* getattr */
-       { &vnop_setattr_desc, (VOPFUNC)fdesc_setattr }, /* setattr */
-       { &vnop_read_desc, (VOPFUNC)fdesc_read },       /* read */
-       { &vnop_write_desc, (VOPFUNC)fdesc_write },     /* write */
-       { &vnop_ioctl_desc, (VOPFUNC)fdesc_ioctl },     /* ioctl */
-       { &vnop_select_desc, (VOPFUNC)fdesc_select },   /* select */
-       { &vnop_revoke_desc, (VOPFUNC)fdesc_revoke },   /* revoke */
-       { &vnop_mmap_desc, (VOPFUNC)fdesc_mmap },       /* mmap */
-       { &vnop_fsync_desc, (VOPFUNC)fdesc_fsync },     /* fsync */
-       { &vnop_remove_desc, (VOPFUNC)fdesc_remove },   /* remove */
-       { &vnop_link_desc, (VOPFUNC)fdesc_link },       /* link */
-       { &vnop_rename_desc, (VOPFUNC)fdesc_rename },   /* rename */
-       { &vnop_mkdir_desc, (VOPFUNC)fdesc_mkdir },     /* mkdir */
-       { &vnop_rmdir_desc, (VOPFUNC)fdesc_rmdir },     /* rmdir */
-       { &vnop_symlink_desc, (VOPFUNC)fdesc_symlink }, /* symlink */
-       { &vnop_readdir_desc, (VOPFUNC)vn_default_error},/* readdir */
-       { &vnop_readlink_desc, (VOPFUNC)err_readlink}, /* readlink */
-       { &vnop_inactive_desc, (VOPFUNC)fdesc_inactive },/* inactive */
-       { &vnop_reclaim_desc, (VOPFUNC)fdesc_reclaim }, /* reclaim */
-       { &vnop_strategy_desc, (VOPFUNC)fdesc_strategy },       /* strategy */
-       { &vnop_pathconf_desc, (VOPFUNC)fdesc_pathconf },       /* pathconf */
-       { &vnop_advlock_desc, (VOPFUNC)fdesc_advlock }, /* advlock */
-       { &vnop_bwrite_desc, (VOPFUNC)fdesc_bwrite },   /* bwrite */
-       { &vnop_pagein_desc, (VOPFUNC)err_pagein },     /* pagein */
-       { &vnop_pageout_desc, (VOPFUNC)err_pageout },   /* pageout */
-       { &vnop_copyfile_desc, (VOPFUNC)err_copyfile }, /* Copyfile */
-       { &vnop_blktooff_desc, (VOPFUNC)fdesc_blktooff },       /* blktooff */
-       { &vnop_blktooff_desc, (VOPFUNC)fdesc_offtoblk },       /* offtoblk */
-       { &vnop_blockmap_desc, (VOPFUNC)fdesc_blockmap },       /* blockmap */
-       { (struct vnodeop_desc*)NULL, (VOPFUNC)NULL }
+const struct vnodeopv_entry_desc devfs_fdesc_vnodeop_entries[] = {
+       { .opve_op = &vnop_default_desc, .opve_impl = (VOPFUNC)vn_default_error },
+       { .opve_op = &vnop_lookup_desc, .opve_impl = (VOPFUNC)vn_default_error},        /* lookup */
+       { .opve_op = &vnop_create_desc, .opve_impl = (VOPFUNC)fdesc_create },   /* create */
+       { .opve_op = &vnop_mknod_desc, .opve_impl = (VOPFUNC)fdesc_mknod },     /* mknod */
+       { .opve_op = &vnop_open_desc, .opve_impl = (VOPFUNC)fdesc_open },       /* open */
+       { .opve_op = &vnop_close_desc, .opve_impl = (VOPFUNC)fdesc_close },     /* close */
+       { .opve_op = &vnop_access_desc, .opve_impl = (VOPFUNC)fdesc_access },   /* access */
+       { .opve_op = &vnop_getattr_desc, .opve_impl = (VOPFUNC)fdesc_getattr }, /* getattr */
+       { .opve_op = &vnop_setattr_desc, .opve_impl = (VOPFUNC)fdesc_setattr }, /* setattr */
+       { .opve_op = &vnop_read_desc, .opve_impl = (VOPFUNC)fdesc_read },       /* read */
+       { .opve_op = &vnop_write_desc, .opve_impl = (VOPFUNC)fdesc_write },     /* write */
+       { .opve_op = &vnop_ioctl_desc, .opve_impl = (VOPFUNC)fdesc_ioctl },     /* ioctl */
+       { .opve_op = &vnop_select_desc, .opve_impl = (VOPFUNC)fdesc_select },   /* select */
+       { .opve_op = &vnop_revoke_desc, .opve_impl = (VOPFUNC)fdesc_revoke },   /* revoke */
+       { .opve_op = &vnop_mmap_desc, .opve_impl = (VOPFUNC)fdesc_mmap },       /* mmap */
+       { .opve_op = &vnop_fsync_desc, .opve_impl = (VOPFUNC)fdesc_fsync },     /* fsync */
+       { .opve_op = &vnop_remove_desc, .opve_impl = (VOPFUNC)fdesc_remove },   /* remove */
+       { .opve_op = &vnop_link_desc, .opve_impl = (VOPFUNC)fdesc_link },       /* link */
+       { .opve_op = &vnop_rename_desc, .opve_impl =  (VOPFUNC)fdesc_rename },   /* rename */
+       { .opve_op = &vnop_mkdir_desc, .opve_impl = (VOPFUNC)fdesc_mkdir },     /* mkdir */
+       { .opve_op = &vnop_rmdir_desc, .opve_impl = (VOPFUNC)fdesc_rmdir },     /* rmdir */
+       { .opve_op = &vnop_symlink_desc, .opve_impl = (VOPFUNC)fdesc_symlink }, /* symlink */
+       { .opve_op = &vnop_readdir_desc, .opve_impl = (VOPFUNC)vn_default_error},/* readdir */
+       { .opve_op = &vnop_readlink_desc, .opve_impl = (VOPFUNC)err_readlink}, /* readlink */
+       { .opve_op = &vnop_inactive_desc, .opve_impl = (VOPFUNC)fdesc_inactive },/* inactive */
+       { .opve_op = &vnop_reclaim_desc, .opve_impl = (VOPFUNC)fdesc_reclaim }, /* reclaim */
+       { .opve_op = &vnop_strategy_desc, .opve_impl = (VOPFUNC)fdesc_strategy },       /* strategy */
+       { .opve_op = &vnop_pathconf_desc, .opve_impl = (VOPFUNC)fdesc_pathconf },       /* pathconf */
+       { .opve_op = &vnop_advlock_desc, .opve_impl = (VOPFUNC)fdesc_advlock }, /* advlock */
+       { .opve_op = &vnop_bwrite_desc, .opve_impl = (VOPFUNC)fdesc_bwrite },   /* bwrite */
+       { .opve_op = &vnop_pagein_desc, .opve_impl = (VOPFUNC)err_pagein },     /* pagein */
+       { .opve_op = &vnop_pageout_desc, .opve_impl = (VOPFUNC)err_pageout },   /* pageout */
+       { .opve_op = &vnop_copyfile_desc, .opve_impl = (VOPFUNC)err_copyfile }, /* Copyfile */
+       { .opve_op = &vnop_blktooff_desc, .opve_impl = (VOPFUNC)fdesc_blktooff },       /* blktooff */
+       { .opve_op = &vnop_blktooff_desc, .opve_impl = (VOPFUNC)fdesc_offtoblk },       /* offtoblk */
+       { .opve_op = &vnop_blockmap_desc, .opve_impl = (VOPFUNC)fdesc_blockmap },       /* blockmap */
+       { .opve_op = (struct vnodeop_desc*)NULL, .opve_impl = (VOPFUNC)NULL }
 };
 
-struct vnodeopv_desc devfs_fdesc_vnodeop_opv_desc =
-{ &fdesc_vnodeop_p, devfs_fdesc_vnodeop_entries };
+const struct vnodeopv_desc devfs_fdesc_vnodeop_opv_desc =
+{ .opv_desc_vector_p = &fdesc_vnodeop_p, .opv_desc_ops = devfs_fdesc_vnodeop_entries };