xnu-517.3.15.tar.gz

[apple/xnu.git] / bsd / miscfs / devfs / devfs_vfsops.c

diff --git a/bsd/miscfs/devfs/devfs_vfsops.c b/bsd/miscfs/devfs/devfs_vfsops.c
index cdc5ee8a539929f37e626472d7d53a8498c59177..0d73574f059b2adb28da866b4c66fbb7e784f3f9 100644 (file)
--- a/bsd/miscfs/devfs/devfs_vfsops.c
+++ b/bsd/miscfs/devfs/devfs_vfsops.c
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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@
  */
@@ -87,7 +90,6 @@ devfs_init(struct vfsconf *vfsp)
 
     if (devfs_sinit())
        return (EOPNOTSUPP);
-    printf("devfs enabled\n");
     devfs_make_node(makedev(0, 0), DEVFS_CHAR, 
                    UID_ROOT, GID_WHEEL, 0622, "console");
     devfs_make_node(makedev(2, 0), DEVFS_CHAR, 
@@ -201,13 +203,15 @@ devfs_unmount( struct mount *mp, int mntflags, struct proc *p)
 {
        struct devfsmount *devfs_mp_p = (struct devfsmount *)mp->mnt_data;
        int flags = 0;
+       int force = 0;
        int error;
        
        if (mntflags & MNT_FORCE) {
                flags |= FORCECLOSE;
+               force = 1;
        }
        error = vflush(mp, NULLVP, flags);
-       if (error)
+       if (error && !force)
                return error;
 
        DEVFS_LOCK(p);
@@ -374,7 +378,8 @@ devfs_kernel_mount(char * mntname)
        /*
         * Allocate and initialize the filesystem.
         */
-       mp = _MALLOC_ZONE((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
+       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 */
@@ -401,12 +406,15 @@ devfs_kernel_mount(char * mntname)
        if (error) {
            printf("devfs_kernel_mount: mount %s failed: %d", mntname, error);
            mp->mnt_vfc->vfc_refcount--;
+
+           if (mp->mnt_kern_flag & MNTK_IO_XINFO)
+                   FREE(mp->mnt_xinfo_ptr, M_TEMP);
            vfs_unbusy(mp, procp);
-           _FREE_ZONE(mp, sizeof (struct mount), M_MOUNT);
+
+           FREE_ZONE(mp, sizeof (struct mount), M_MOUNT);
            vput(vp);
            return (error);
        }
-       printf("devfs on %s\n", mntname);
        simple_lock(&mountlist_slock);
        CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list);
        simple_unlock(&mountlist_slock);