xnu-1228.15.4.tar.gz

[apple/xnu.git] / bsd / vfs / vnode_if.c

diff --git a/bsd/vfs/vnode_if.c b/bsd/vfs/vnode_if.c
index b77c7c3d4f04bda29540ab6ad5621bedb6469177..df30827aec99ff66f8d5b30f3fddd906d2539304 100644 (file)
--- a/bsd/vfs/vnode_if.c
+++ b/bsd/vfs/vnode_if.c
@@ -2,23 +2,29 @@
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved
@@ -78,7 +84,8 @@ struct vnodeop_desc vnop_default_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
 };
 
 
@@ -96,7 +103,7 @@ struct vnodeop_desc vnop_lookup_desc = {
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_lookup_args, a_cnp),
        VOPARG_OFFSETOF(struct vnop_lookup_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_create_vp_offsets[] = {
@@ -113,7 +120,7 @@ struct vnodeop_desc vnop_create_desc = {
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_create_args, a_cnp),
        VOPARG_OFFSETOF(struct vnop_create_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_whiteout_vp_offsets[] = {
@@ -130,7 +137,7 @@ struct vnodeop_desc vnop_whiteout_desc = {
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_whiteout_args, a_cnp),
        VOPARG_OFFSETOF(struct vnop_whiteout_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_mknod_vp_offsets[] = {
@@ -147,7 +154,7 @@ struct vnodeop_desc vnop_mknod_desc = {
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_mknod_args, a_cnp),
        VOPARG_OFFSETOF(struct vnop_mknod_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_open_vp_offsets[] = {
@@ -164,7 +171,7 @@ struct vnodeop_desc vnop_open_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_open_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_close_vp_offsets[] = {
@@ -181,7 +188,7 @@ struct vnodeop_desc vnop_close_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_close_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_access_vp_offsets[] = {
@@ -198,7 +205,7 @@ struct vnodeop_desc vnop_access_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_close_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_getattr_vp_offsets[] = {
@@ -215,7 +222,7 @@ struct vnodeop_desc vnop_getattr_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_getattr_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_setattr_vp_offsets[] = {
@@ -232,41 +239,7 @@ struct vnodeop_desc vnop_setattr_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_setattr_args, a_context),
-       NULL,
-};
-
-int vnop_getattrlist_vp_offsets[] = {
-       VOPARG_OFFSETOF(struct vnop_getattrlist_args,a_vp),
-       VDESC_NO_OFFSET
-};
-struct vnodeop_desc vnop_getattrlist_desc = {
-       0,
-       "vnop_getattrlist",
-       0,
-       vnop_getattrlist_vp_offsets,
-       VDESC_NO_OFFSET,
-       VDESC_NO_OFFSET,
-       VDESC_NO_OFFSET,
-       VDESC_NO_OFFSET,
-       VOPARG_OFFSETOF(struct vnop_getattrlist_args, a_context),
-       NULL,
-};
-
-int vnop_setattrlist_vp_offsets[] = {
-       VOPARG_OFFSETOF(struct vnop_setattrlist_args,a_vp),
-       VDESC_NO_OFFSET
-};
-struct vnodeop_desc vnop_setattrlist_desc = {
-       0,
-       "vnop_setattrlist",
-       0,
-       vnop_setattrlist_vp_offsets,
-       VDESC_NO_OFFSET,
-       VDESC_NO_OFFSET,
-       VDESC_NO_OFFSET,
-       VDESC_NO_OFFSET,
-       VOPARG_OFFSETOF(struct vnop_setattrlist_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_read_vp_offsets[] = {
@@ -283,7 +256,7 @@ struct vnodeop_desc vnop_read_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_read_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_write_vp_offsets[] = {
@@ -300,7 +273,7 @@ struct vnodeop_desc vnop_write_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_write_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_ioctl_vp_offsets[] = {
@@ -317,7 +290,7 @@ struct vnodeop_desc vnop_ioctl_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_ioctl_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_select_vp_offsets[] = {
@@ -334,8 +307,7 @@ struct vnodeop_desc vnop_select_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_select_args, a_context),
-       VDESC_NO_OFFSET,
-       NULL,
+       NULL
 };
 
 int vnop_exchange_vp_offsets[] = {
@@ -353,7 +325,7 @@ struct vnodeop_desc vnop_exchange_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_exchange_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_kqfilt_add_vp_offsets[] = {
@@ -370,7 +342,7 @@ struct vnodeop_desc vnop_kqfilt_add_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_kqfilt_add_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_kqfilt_remove_vp_offsets[] = {
@@ -387,6 +359,23 @@ struct vnodeop_desc vnop_kqfilt_remove_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_kqfilt_remove_args, a_context),
+       NULL
+};
+
+int vnop_setlabel_vp_offsets[] = {
+       VOPARG_OFFSETOF(struct vnop_setlabel_args,a_vp),
+       VDESC_NO_OFFSET
+};
+struct vnodeop_desc vnop_setlabel_desc = {
+       0,
+       "vnop_setlabel",
+       0,
+       vnop_setlabel_vp_offsets,
+       VDESC_NO_OFFSET,
+       VDESC_NO_OFFSET,
+       VDESC_NO_OFFSET,
+       VDESC_NO_OFFSET,
+       VOPARG_OFFSETOF(struct vnop_setlabel_args, a_context),
        NULL,
 };
 
@@ -403,7 +392,8 @@ struct vnodeop_desc vnop_revoke_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
 };
 
 
@@ -420,7 +410,8 @@ struct vnodeop_desc vnop_mmap_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
 };
 
 
@@ -437,7 +428,8 @@ struct vnodeop_desc vnop_mnomap_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
 };
 
 
@@ -455,7 +447,7 @@ struct vnodeop_desc vnop_fsync_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_fsync_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_remove_vp_offsets[] = {
@@ -473,7 +465,7 @@ struct vnodeop_desc vnop_remove_desc = {
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_remove_args, a_cnp),
        VOPARG_OFFSETOF(struct vnop_remove_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_link_vp_offsets[] = {
@@ -491,7 +483,7 @@ struct vnodeop_desc vnop_link_desc = {
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_link_args, a_cnp),
        VOPARG_OFFSETOF(struct vnop_link_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_rename_vp_offsets[] = {
@@ -511,7 +503,7 @@ struct vnodeop_desc vnop_rename_desc = {
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_rename_args, a_fcnp),
        VOPARG_OFFSETOF(struct vnop_rename_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_mkdir_vp_offsets[] = {
@@ -528,7 +520,7 @@ struct vnodeop_desc vnop_mkdir_desc = {
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_mkdir_args, a_cnp),
        VOPARG_OFFSETOF(struct vnop_mkdir_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_rmdir_vp_offsets[] = {
@@ -546,7 +538,7 @@ struct vnodeop_desc vnop_rmdir_desc = {
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_rmdir_args, a_cnp),
        VOPARG_OFFSETOF(struct vnop_rmdir_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_symlink_vp_offsets[] = {
@@ -563,7 +555,7 @@ struct vnodeop_desc vnop_symlink_desc = {
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_symlink_args, a_cnp),
        VOPARG_OFFSETOF(struct vnop_symlink_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_readdir_vp_offsets[] = {
@@ -580,7 +572,7 @@ struct vnodeop_desc vnop_readdir_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_symlink_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_readdirattr_vp_offsets[] = {
@@ -597,7 +589,7 @@ struct vnodeop_desc vnop_readdirattr_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_readdirattr_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_readlink_vp_offsets[] = {
@@ -614,7 +606,7 @@ struct vnodeop_desc vnop_readlink_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_readlink_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_inactive_vp_offsets[] = {
@@ -631,7 +623,7 @@ struct vnodeop_desc vnop_inactive_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_inactive_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_reclaim_vp_offsets[] = {
@@ -648,7 +640,7 @@ struct vnodeop_desc vnop_reclaim_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_reclaim_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_pathconf_vp_offsets[] = {
@@ -665,7 +657,7 @@ struct vnodeop_desc vnop_pathconf_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_pathconf_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_advlock_vp_offsets[] = {
@@ -682,7 +674,7 @@ struct vnodeop_desc vnop_advlock_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_advlock_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_allocate_vp_offsets[] = {
@@ -699,7 +691,7 @@ struct vnodeop_desc vnop_allocate_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_allocate_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_pagein_vp_offsets[] = {
@@ -716,7 +708,7 @@ struct vnodeop_desc vnop_pagein_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_pagein_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_pageout_vp_offsets[] = {
@@ -733,23 +725,7 @@ struct vnodeop_desc vnop_pageout_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_pageout_args, a_context),
-       NULL,
-};
-
-int vnop_devblocksize_vp_offsets[] = {
-       VOPARG_OFFSETOF(struct vnop_devblocksize_args,a_vp),
-       VDESC_NO_OFFSET
-};
-struct vnodeop_desc vnop_devblocksize_desc = {
-       0,
-       "vnop_devblocksize",
-       0,
-       vnop_devblocksize_vp_offsets,
-       VDESC_NO_OFFSET,
-       VDESC_NO_OFFSET,
-       VDESC_NO_OFFSET,
-       VDESC_NO_OFFSET,
-       NULL,
+       NULL
 };
 
 int vnop_searchfs_vp_offsets[] = {
@@ -765,7 +741,8 @@ struct vnodeop_desc vnop_searchfs_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
 };
 
 int vnop_copyfile_vp_offsets[] = {
@@ -783,7 +760,8 @@ struct vnodeop_desc vnop_copyfile_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_copyfile_args, a_tcnp),
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
 };
 
 int vop_getxattr_vp_offsets[] = {
@@ -800,7 +778,7 @@ struct vnodeop_desc vnop_getxattr_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_getxattr_args, a_context),
-       NULL,
+       NULL
 };
 
 int vop_setxattr_vp_offsets[] = {
@@ -817,7 +795,7 @@ struct vnodeop_desc vnop_setxattr_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_setxattr_args, a_context),
-       NULL,
+       NULL
 };
 
 int vop_removexattr_vp_offsets[] = {
@@ -834,7 +812,7 @@ struct vnodeop_desc vnop_removexattr_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_removexattr_args, a_context),
-       NULL,
+       NULL
 };
 
 int vop_listxattr_vp_offsets[] = {
@@ -851,7 +829,7 @@ struct vnodeop_desc vnop_listxattr_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VOPARG_OFFSETOF(struct vnop_listxattr_args, a_context),
-       NULL,
+       NULL
 };
 
 int vnop_blktooff_vp_offsets[] = {
@@ -867,7 +845,8 @@ struct vnodeop_desc vnop_blktooff_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
 };
 
 int vnop_offtoblk_vp_offsets[] = {
@@ -883,7 +862,8 @@ struct vnodeop_desc vnop_offtoblk_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
 };
 
 int vnop_blockmap_vp_offsets[] = {
@@ -899,9 +879,68 @@ struct vnodeop_desc vnop_blockmap_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
+};
+
+#if NAMEDSTREAMS
+int vnop_getnamedstream_vp_offsets[] = {
+       VOPARG_OFFSETOF(struct vnop_getnamedstream_args, a_vp),
+       VDESC_NO_OFFSET
+};
+struct vnodeop_desc vnop_getnamedstream_desc = {
+       0,
+       "vnop_getnamedstream",
+       0,
+       vnop_getnamedstream_vp_offsets,
+       VOPARG_OFFSETOF(struct vnop_getnamedstream_args, a_svpp),
+       VDESC_NO_OFFSET,
+       VDESC_NO_OFFSET,
+       VOPARG_OFFSETOF(struct vnop_getnamedstream_args, a_name),
+       VOPARG_OFFSETOF(struct vnop_getnamedstream_args, a_context),
+       NULL
 };
 
+int vnop_makenamedstream_vp_offsets[] = {
+       VOPARG_OFFSETOF(struct vnop_makenamedstream_args, a_vp),
+       VDESC_NO_OFFSET
+};
+struct vnodeop_desc vnop_makenamedstream_desc = {
+       0,
+       "vnop_makenamedstream",
+       0, /* flags */
+       vnop_makenamedstream_vp_offsets,
+       VOPARG_OFFSETOF(struct vnop_makenamedstream_args, a_svpp),
+       VDESC_NO_OFFSET,
+       VDESC_NO_OFFSET,
+       VOPARG_OFFSETOF(struct vnop_makenamedstream_args, a_name),
+       VOPARG_OFFSETOF(struct vnop_makenamedstream_args, a_context),
+       NULL
+};
+
+int vnop_removenamedstream_vp_offsets[] = {
+       VOPARG_OFFSETOF(struct vnop_removenamedstream_args, a_vp),
+       VDESC_NO_OFFSET
+};
+struct vnodeop_desc vnop_removenamedstream_desc = {
+       0,
+       "vnop_removenamedstream",
+       0,
+       vnop_removenamedstream_vp_offsets,
+       VDESC_NO_OFFSET,
+       VDESC_NO_OFFSET,
+       VDESC_NO_OFFSET,
+       VOPARG_OFFSETOF(struct vnop_removenamedstream_args, a_name),
+       VOPARG_OFFSETOF(struct vnop_removenamedstream_args, a_context),
+       NULL
+};
+#else
+/* These symbols are in the exports list so they need to always be defined. */
+int vnop_getnamedstream_desc;
+int vnop_makenamedstream_desc;
+int vnop_removenamedstream_desc;
+#endif
+
 /* Special cases: */
 
 int vnop_strategy_vp_offsets[] = {
@@ -916,7 +955,8 @@ struct vnodeop_desc vnop_strategy_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
 };
 
 int vnop_bwrite_vp_offsets[] = {
@@ -931,7 +971,8 @@ struct vnodeop_desc vnop_bwrite_desc = {
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
        VDESC_NO_OFFSET,
-       NULL,
+       VDESC_NO_OFFSET,
+       NULL
 };
 
 /* End of special cases. */
@@ -950,8 +991,6 @@ struct vnodeop_desc *vfs_op_descs[] = {
        &vnop_access_desc,
        &vnop_getattr_desc,
        &vnop_setattr_desc,
-       &vnop_getattrlist_desc,
-       &vnop_setattrlist_desc,
        &vnop_read_desc,
        &vnop_write_desc,
        &vnop_ioctl_desc,
@@ -959,6 +998,7 @@ struct vnodeop_desc *vfs_op_descs[] = {
        &vnop_exchange_desc,
        &vnop_kqfilt_add_desc,
        &vnop_kqfilt_remove_desc,
+       &vnop_setlabel_desc,
        &vnop_revoke_desc,
        &vnop_mmap_desc,
        &vnop_mnomap_desc,
@@ -979,7 +1019,6 @@ struct vnodeop_desc *vfs_op_descs[] = {
        &vnop_allocate_desc,
        &vnop_pagein_desc,
        &vnop_pageout_desc,
-       &vnop_devblocksize_desc,
        &vnop_searchfs_desc,
        &vnop_copyfile_desc,
        &vnop_getxattr_desc,
@@ -989,6 +1028,11 @@ struct vnodeop_desc *vfs_op_descs[] = {
        &vnop_blktooff_desc,
        &vnop_offtoblk_desc,
        &vnop_blockmap_desc,
+#if NAMEDSTREAMS
+       &vnop_getnamedstream_desc,
+       &vnop_makenamedstream_desc,
+       &vnop_removenamedstream_desc,
+#endif
        NULL
 };