xnu-1228.0.2.tar.gz

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

diff --git a/bsd/vfs/vfs_init.c b/bsd/vfs/vfs_init.c
index 5074582f78d5b1015598d3c6742a287d64fb121b..fe9c904c5d50a0c51ef4c0f2937a1215738cd4da 100644 (file)
--- a/bsd/vfs/vfs_init.c
+++ b/bsd/vfs/vfs_init.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple 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,
  * 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 */
 /*
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*


@@ -59,20 +65,33 @@
  *
  *     @(#)vfs_init.c  8.5 (Berkeley) 5/11/95
  */
  *
  *     @(#)vfs_init.c  8.5 (Berkeley) 5/11/95
  */

+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */

 
 
 #include <sys/param.h>
 
 
 #include <sys/param.h>

-#include <sys/mount.h>
+#include <sys/mount_internal.h>

 #include <sys/time.h>
 #include <sys/vm.h>
 #include <sys/time.h>
 #include <sys/vm.h>

-#include <sys/vnode.h>
+#include <sys/vnode_internal.h>

 #include <sys/stat.h>
 #include <sys/namei.h>
 #include <sys/ucred.h>
 #include <sys/stat.h>
 #include <sys/namei.h>
 #include <sys/ucred.h>

-#include <sys/buf.h>

 #include <sys/errno.h>
 #include <sys/malloc.h>
 
 #include <sys/errno.h>
 #include <sys/malloc.h>
 

+#include <vfs/vfs_journal.h>   /* journal_init() */
+#if CONFIG_MACF
+#include <security/mac_framework.h>
+#include <sys/kauth.h>
+#endif
+#if QUOTA
+#include <sys/quota.h>
+#endif

 
 /*
  * Sigh, such primitive tools are these...
 
 /*
  * Sigh, such primitive tools are these...


@@ -83,7 +102,8 @@
 #define DODEBUG(A)
 #endif
 
 #define DODEBUG(A)
 #endif
 

-extern uid_t console_user;
+__private_extern__ void vntblinit(void) __attribute__((section("__TEXT, initcode")));
+

 extern struct vnodeopv_desc *vfs_opv_descs[];
                                /* a list of lists of vnodeops defns */
 extern struct vnodeop_desc *vfs_op_descs[];
 extern struct vnodeopv_desc *vfs_opv_descs[];
                                /* a list of lists of vnodeops defns */
 extern struct vnodeop_desc *vfs_op_descs[];


@@ -96,17 +116,17 @@ extern struct vnodeop_desc *vfs_op_descs[];
  */
 int vfs_opv_numops;
 
  */
 int vfs_opv_numops;
 

-typedef (*PFI)();   /* the standard Pointer to a Function returning an Int */
+typedef int (*PFIvp)(void *); 

 
 /*
  * A miscellaneous routine.
  * A generic "default" routine that just returns an error.
  */
 int
 
 /*
  * A miscellaneous routine.
  * A generic "default" routine that just returns an error.
  */
 int

-vn_default_error()
+vn_default_error(void)

 {
 
 {
 

-       return (EOPNOTSUPP);
+       return (ENOTSUP);

 }
 
 /*
 }
 
 /*


@@ -126,7 +146,7 @@ vn_default_error()
  * that is a(whole)nother story.) This is a feature.
  */
 void
  * that is a(whole)nother story.) This is a feature.
  */
 void

-vfs_opv_init()
+vfs_opv_init(void)

 {
        int i, j, k;
        int (***opv_desc_vector_p)(void *);
 {
        int i, j, k;
        int (***opv_desc_vector_p)(void *);


@@ -143,9 +163,9 @@ vfs_opv_init()
                 * Also handle backwards compatibility.
                 */
                if (*opv_desc_vector_p == NULL) {
                 * Also handle backwards compatibility.
                 */
                if (*opv_desc_vector_p == NULL) {

-                       MALLOC(*opv_desc_vector_p, PFI*,
-                              vfs_opv_numops*sizeof(PFI), M_TEMP, M_WAITOK);
-                       bzero (*opv_desc_vector_p, vfs_opv_numops*sizeof(PFI));
+                       MALLOC(*opv_desc_vector_p, PFIvp*,
+                              vfs_opv_numops*sizeof(PFIvp), M_TEMP, M_WAITOK);
+                       bzero (*opv_desc_vector_p, vfs_opv_numops*sizeof(PFIvp));

                        DODEBUG(printf("vector at %x allocated\n",
                            opv_desc_vector_p));
                }
                        DODEBUG(printf("vector at %x allocated\n",
                            opv_desc_vector_p));
                }


@@ -172,7 +192,7 @@ vfs_opv_init()
                         */
                        if (opve_descp->opve_op->vdesc_offset == 0 &&
                                    opve_descp->opve_op->vdesc_offset !=
                         */
                        if (opve_descp->opve_op->vdesc_offset == 0 &&
                                    opve_descp->opve_op->vdesc_offset !=

-                                       VOFFSET(vop_default)) {
+                                       VOFFSET(vnop_default)) {

                                printf("operation %s not listed in %s.\n",
                                    opve_descp->opve_op->vdesc_name,
                                    "vfs_op_descs");
                                printf("operation %s not listed in %s.\n",
                                    opve_descp->opve_op->vdesc_name,
                                    "vfs_op_descs");


@@ -195,13 +215,13 @@ vfs_opv_init()
                /*
                 * Force every operations vector to have a default routine.
                 */
                /*
                 * Force every operations vector to have a default routine.
                 */

-               if (opv_desc_vector[VOFFSET(vop_default)]==NULL) {
+               if (opv_desc_vector[VOFFSET(vnop_default)]==NULL) {

                        panic("vfs_opv_init: operation vector without default routine.");
                }
                for (k = 0; k<vfs_opv_numops; k++)
                        if (opv_desc_vector[k] == NULL)
                                opv_desc_vector[k] = 
                        panic("vfs_opv_init: operation vector without default routine.");
                }
                for (k = 0; k<vfs_opv_numops; k++)
                        if (opv_desc_vector[k] == NULL)
                                opv_desc_vector[k] = 

-                                       opv_desc_vector[VOFFSET(vop_default)];
+                                       opv_desc_vector[VOFFSET(vnop_default)];

        }
 }
 
        }
 }
 


@@ -209,7 +229,7 @@ vfs_opv_init()
  * Initialize known vnode operations vectors.
  */
 void
  * Initialize known vnode operations vectors.
  */
 void

-vfs_op_init()
+vfs_op_init(void)

 {
        int i;
 
 {
        int i;
 


@@ -235,21 +255,100 @@ vfs_op_init()
  */
 extern struct vnodeops dead_vnodeops;
 extern struct vnodeops spec_vnodeops;
  */
 extern struct vnodeops dead_vnodeops;
 extern struct vnodeops spec_vnodeops;

-struct vattr va_null;

 
 

+/* vars for vnode lock */
+lck_grp_t * vnode_lck_grp;
+lck_grp_attr_t * vnode_lck_grp_attr;
+lck_attr_t * vnode_lck_attr;
+
+
+/* vars for vnode list lock */
+lck_grp_t * vnode_list_lck_grp;
+lck_grp_attr_t * vnode_list_lck_grp_attr;
+lck_attr_t * vnode_list_lck_attr;
+lck_spin_t * vnode_list_spin_lock;
+lck_mtx_t * spechash_mtx_lock;
+
+/* vars for vfsconf lock */
+lck_grp_t * fsconf_lck_grp;
+lck_grp_attr_t * fsconf_lck_grp_attr;
+lck_attr_t * fsconf_lck_attr;
+
+
+/* vars for mount lock */
+lck_grp_t * mnt_lck_grp;
+lck_grp_attr_t * mnt_lck_grp_attr;
+lck_attr_t * mnt_lck_attr;
+
+/* vars for mount list lock */
+lck_grp_t * mnt_list_lck_grp;
+lck_grp_attr_t * mnt_list_lck_grp_attr;
+lck_attr_t * mnt_list_lck_attr;
+lck_mtx_t * mnt_list_mtx_lock;
+
+struct mount * dead_mountp;

 /*
  * Initialize the vnode structures and initialize each file system type.
  */
 /*
  * Initialize the vnode structures and initialize each file system type.
  */

-vfsinit()
+void
+vfsinit(void)

 {
 {

-       struct vfsconf *vfsp;
+       struct vfstable *vfsp;

        int i, maxtypenum;
        int i, maxtypenum;

+       struct mount * mp;
+       
+       /* Allocate vnode list lock group attribute and group */
+       vnode_list_lck_grp_attr = lck_grp_attr_alloc_init();

 
 

-       /*
-        * Initialize the "console user" for access purposes:
-        */
-       console_user = (uid_t)0;
+       vnode_list_lck_grp = lck_grp_alloc_init("vnode list",  vnode_list_lck_grp_attr);

        
        

+       /* Allocate vnode list lock attribute */
+       vnode_list_lck_attr = lck_attr_alloc_init();
+
+       /* Allocate vnode list lock */
+       vnode_list_spin_lock = lck_spin_alloc_init(vnode_list_lck_grp, vnode_list_lck_attr);
+
+       /* Allocate spec hash list lock */
+       spechash_mtx_lock = lck_mtx_alloc_init(vnode_list_lck_grp, vnode_list_lck_attr);
+
+       /* allocate vnode lock group attribute and group */
+       vnode_lck_grp_attr= lck_grp_attr_alloc_init();
+
+       vnode_lck_grp = lck_grp_alloc_init("vnode",  vnode_lck_grp_attr);
+
+       /* Allocate vnode lock attribute */
+       vnode_lck_attr = lck_attr_alloc_init();
+
+       /* Allocate fs config lock group attribute and group */
+       fsconf_lck_grp_attr= lck_grp_attr_alloc_init();
+
+       fsconf_lck_grp = lck_grp_alloc_init("fs conf",  fsconf_lck_grp_attr);
+       
+       /* Allocate fs config lock attribute */
+       fsconf_lck_attr = lck_attr_alloc_init();
+
+       /* Allocate mount point related lock structures  */
+
+       /* Allocate mount list lock group attribute and group */
+       mnt_list_lck_grp_attr= lck_grp_attr_alloc_init();
+
+       mnt_list_lck_grp = lck_grp_alloc_init("mount list",  mnt_list_lck_grp_attr);
+       
+       /* Allocate mount list lock attribute */
+       mnt_list_lck_attr = lck_attr_alloc_init();
+
+       /* Allocate mount list lock */
+       mnt_list_mtx_lock = lck_mtx_alloc_init(mnt_list_lck_grp, mnt_list_lck_attr);
+
+
+       /* allocate mount lock group attribute and group */
+       mnt_lck_grp_attr= lck_grp_attr_alloc_init();
+
+       mnt_lck_grp = lck_grp_alloc_init("mount",  mnt_lck_grp_attr);
+
+       /* Allocate mount lock attribute */
+       mnt_lck_attr = lck_attr_alloc_init();
+

        /*
         * Initialize the vnode table
         */
        /*
         * Initialize the vnode table
         */


@@ -262,6 +361,14 @@ vfsinit()
         * Initialize the vnode name cache
         */
        nchinit();
         * Initialize the vnode name cache
         */
        nchinit();

+
+#if JOURNALING
+       /*
+        * Initialize the journaling locks
+        */
+       journal_init();
+#endif 
+

        /*
         * Build vnode operation vectors.
         */
        /*
         * Build vnode operation vectors.
         */


@@ -271,23 +378,109 @@ vfsinit()
         * Initialize each file system type in the static list,
         * until the first NULL ->vfs_vfsops is encountered.
         */
         * Initialize each file system type in the static list,
         * until the first NULL ->vfs_vfsops is encountered.
         */

-       vattr_null(&va_null);

        numused_vfsslots = maxtypenum = 0;
        numused_vfsslots = maxtypenum = 0;

-       for (vfsp = vfsconf, i = 0; i < maxvfsconf; i++, vfsp++) {
+       for (vfsp = vfsconf, i = 0; i < maxvfsslots; i++, vfsp++) {

                if (vfsp->vfc_vfsops == (struct vfsops *)0)
                        break;
                if (i) vfsconf[i-1].vfc_next = vfsp;
                if (maxtypenum <= vfsp->vfc_typenum)
                        maxtypenum = vfsp->vfc_typenum + 1;
                if (vfsp->vfc_vfsops == (struct vfsops *)0)
                        break;
                if (i) vfsconf[i-1].vfc_next = vfsp;
                if (maxtypenum <= vfsp->vfc_typenum)
                        maxtypenum = vfsp->vfc_typenum + 1;

-               (*vfsp->vfc_vfsops->vfs_init)(vfsp);
+               /* a vfsconf is a prefix subset of a vfstable... */
+               (*vfsp->vfc_vfsops->vfs_init)((struct vfsconf *)vfsp);
+               
+               lck_mtx_init(&vfsp->vfc_lock, fsconf_lck_grp, fsconf_lck_attr);
+               

                numused_vfsslots++;
        }
        /* next vfc_typenum to be used */
        maxvfsconf = maxtypenum;
                numused_vfsslots++;
        }
        /* next vfc_typenum to be used */
        maxvfsconf = maxtypenum;

+
+       /*
+        * Initialize the vnop authorization scope.
+        */
+       vnode_authorize_init();
+
+       /*
+        * Initialiize the quota system.
+        */
+#if QUOTA
+       dqinit();
+#endif
+       
+       /* 
+        * create a mount point for dead vnodes
+        */
+       MALLOC_ZONE(mp, struct mount *, (u_long)sizeof(struct mount),
+               M_MOUNT, M_WAITOK);
+       bzero((char *)mp, (u_long)sizeof(struct mount));
+       /* Initialize the default IO constraints */
+       mp->mnt_maxreadcnt = mp->mnt_maxwritecnt = MAXPHYS;
+       mp->mnt_segreadcnt = mp->mnt_segwritecnt = 32;
+       mp->mnt_maxsegreadsize = mp->mnt_maxreadcnt;
+       mp->mnt_maxsegwritesize = mp->mnt_maxwritecnt;
+       mp->mnt_devblocksize = DEV_BSIZE;
+       mp->mnt_alignmentmask = PAGE_MASK;
+       mp->mnt_ioflags = 0;
+       mp->mnt_realrootvp = NULLVP;
+       mp->mnt_authcache_ttl = CACHED_LOOKUP_RIGHT_TTL;
+    
+       TAILQ_INIT(&mp->mnt_vnodelist);
+       TAILQ_INIT(&mp->mnt_workerqueue);
+       TAILQ_INIT(&mp->mnt_newvnodes);
+       mp->mnt_flag = MNT_LOCAL;
+       mp->mnt_lflag = MNT_LDEAD;
+       mount_lock_init(mp);
+
+#if CONFIG_MACF
+       mac_mount_label_init(mp);
+       mac_mount_label_associate(vfs_context_kernel(), mp);
+#endif
+       dead_mountp = mp;
+}
+
+void
+vnode_list_lock(void)
+{
+       lck_spin_lock(vnode_list_spin_lock);
+}
+
+void
+vnode_list_unlock(void)
+{
+       lck_spin_unlock(vnode_list_spin_lock);
+}
+
+void
+mount_list_lock(void)
+{
+       lck_mtx_lock(mnt_list_mtx_lock);
+}
+
+void
+mount_list_unlock(void)
+{
+       lck_mtx_unlock(mnt_list_mtx_lock);
+}
+
+void
+mount_lock_init(mount_t mp)
+{
+       lck_mtx_init(&mp->mnt_mlock, mnt_lck_grp, mnt_lck_attr);
+       lck_mtx_init(&mp->mnt_renamelock, mnt_lck_grp, mnt_lck_attr);
+       lck_rw_init(&mp->mnt_rwlock, mnt_lck_grp, mnt_lck_attr);

 }
 
 }
 

+void
+mount_lock_destroy(mount_t mp)
+{
+       lck_mtx_destroy(&mp->mnt_mlock, mnt_lck_grp);
+       lck_mtx_destroy(&mp->mnt_renamelock, mnt_lck_grp);
+       lck_rw_destroy(&mp->mnt_rwlock, mnt_lck_grp);
+}
+
+

 /*
 /*

- * Name:       vfsconf_add
+ * Name:       vfstable_add

  *
  * Description:        Add a filesystem to the vfsconf list at the first
  *             unused slot.  If no slots are available, return an
  *
  * Description:        Add a filesystem to the vfsconf list at the first
  *             unused slot.  If no slots are available, return an


@@ -305,15 +498,12 @@ vfsinit()
  *
  * Warning:    This code assumes that vfsconf[0] is non-empty.
  */
  *
  * Warning:    This code assumes that vfsconf[0] is non-empty.
  */

-int
-vfsconf_add(struct vfsconf *nvfsp)
+struct vfstable *
+vfstable_add(struct vfstable  *nvfsp)

 {
        int slot;
 {
        int slot;

-       struct vfsconf *slotp;
+       struct vfstable *slotp;

 
 

-       if (nvfsp == NULL)      /* overkill */
-               return (-1);
-       

        /*
         * Find the next empty slot; we recognize an empty slot by a
         * NULL-valued ->vfc_vfsops, so if we delete a VFS, we must
        /*
         * Find the next empty slot; we recognize an empty slot by a
         * NULL-valued ->vfc_vfsops, so if we delete a VFS, we must


@@ -325,7 +515,7 @@ vfsconf_add(struct vfsconf *nvfsp)
        }
        if (slot == maxvfsslots) {
                /* out of static slots; allocate one instead */
        }
        if (slot == maxvfsslots) {
                /* out of static slots; allocate one instead */

-               MALLOC(slotp, struct vfsconf *, sizeof(struct vfsconf),
+               MALLOC(slotp, struct vfstable *, sizeof(struct vfstable),

                                                        M_TEMP, M_WAITOK);
        } else {
                slotp = &vfsconf[slot];
                                                        M_TEMP, M_WAITOK);
        } else {
                slotp = &vfsconf[slot];


@@ -338,7 +528,8 @@ vfsconf_add(struct vfsconf *nvfsp)
         * Note; Takes advantage of the fact that 'slot' was left
         * with the value of 'maxvfslots' in the allocation case.
         */
         * Note; Takes advantage of the fact that 'slot' was left
         * with the value of 'maxvfslots' in the allocation case.
         */

-       bcopy(nvfsp, slotp, sizeof(struct vfsconf));
+       bcopy(nvfsp, slotp, sizeof(struct vfstable));
+       lck_mtx_init(&slotp->vfc_lock, fsconf_lck_grp, fsconf_lck_attr);

        if (slot != 0) {
                slotp->vfc_next = vfsconf[slot - 1].vfc_next;
                vfsconf[slot - 1].vfc_next = slotp;
        if (slot != 0) {
                slotp->vfc_next = vfsconf[slot - 1].vfc_next;
                vfsconf[slot - 1].vfc_next = slotp;


@@ -347,22 +538,11 @@ vfsconf_add(struct vfsconf *nvfsp)
        }
        numused_vfsslots++;
 
        }
        numused_vfsslots++;
 

-       /*
-        * Call through the ->vfs_init(); use slotp instead of nvfsp,
-        * so that if the FS cares where it's instance record is, it
-        * can find it later.
-        *
-        * XXX All code that calls ->vfs_init treats it as if it
-        * XXX returns a "void', and can never fail.
-        */
-       if (nvfsp->vfc_vfsops->vfs_init)
-               (*nvfsp->vfc_vfsops->vfs_init)(slotp);
-
-       return(0);
+       return(slotp);

 }
 
 /*
 }
 
 /*

- * Name:       vfsconf_del
+ * Name:       vfstable_del

  *
  * Description:        Remove a filesystem from the vfsconf list by name.
  *             If no such filesystem exists, return an error.
  *
  * Description:        Remove a filesystem from the vfsconf list by name.
  *             If no such filesystem exists, return an error.


@@ -375,30 +555,30 @@ vfsconf_add(struct vfsconf *nvfsp)
  * Notes:      Hopefully all filesystems have unique names.
  */
 int
  * Notes:      Hopefully all filesystems have unique names.
  */
 int

-vfsconf_del(char * fs_name)
+vfstable_del(struct vfstable  * vtbl)

 {
 {

-       struct vfsconf **vcpp;
-       struct vfsconf *vcdelp;
+       struct vfstable **vcpp;
+       struct vfstable *vcdelp;

 
        /*
 
        /*

-        * Traverse the list looking for fs_name; if found, *vcpp
+        * Traverse the list looking for vtbl; if found, *vcpp

         * will contain the address of the pointer to the entry to
         * be removed.
         */
        for( vcpp = &vfsconf; *vcpp; vcpp = &(*vcpp)->vfc_next) {
         * will contain the address of the pointer to the entry to
         * be removed.
         */
        for( vcpp = &vfsconf; *vcpp; vcpp = &(*vcpp)->vfc_next) {

-               if (strcmp( (*vcpp)->vfc_name, fs_name) == 0)
+               if (*vcpp == vtbl)

             break;
         }
 
             break;
         }
 

-       if (*vcpp == NULL) {
-          /* XXX need real error code for entry not found */
-          return(-1);
-       }
+       if (*vcpp == NULL)
+          return(ESRCH);       /* vtbl not on vfsconf list */

 
        /* Unlink entry */
        vcdelp = *vcpp;
        *vcpp = (*vcpp)->vfc_next;
 
 
        /* Unlink entry */
        vcdelp = *vcpp;
        *vcpp = (*vcpp)->vfc_next;
 

+       lck_mtx_destroy(&vcdelp->vfc_lock, fsconf_lck_grp);
+

        /*
         * Is this an entry from our static table?  We find out by
         * seeing if the pointer to the object to be deleted places
        /*
         * Is this an entry from our static table?  We find out by
         * seeing if the pointer to the object to be deleted places


@@ -406,7 +586,7 @@ vfsconf_del(char * fs_name)
         */
        if (vcdelp >= vfsconf && vcdelp < (vfsconf + maxvfsslots)) {    /* Y */
                /* Mark as empty for vfscon_add() */
         */
        if (vcdelp >= vfsconf && vcdelp < (vfsconf + maxvfsslots)) {    /* Y */
                /* Mark as empty for vfscon_add() */

-               bzero(vcdelp, sizeof(struct vfsconf));
+               bzero(vcdelp, sizeof(struct vfstable));

                numused_vfsslots--;
        } else {                                                        /* N */
                /*
                numused_vfsslots--;
        } else {                                                        /* N */
                /*


@@ -420,3 +600,16 @@ vfsconf_del(char * fs_name)
 
        return(0);
 }
 
        return(0);
 }

+
+void
+SPECHASH_LOCK(void)
+{
+       lck_mtx_lock(spechash_mtx_lock);
+}
+
+void
+SPECHASH_UNLOCK(void)
+{
+       lck_mtx_unlock(spechash_mtx_lock);
+}
+