xnu-344.49.tar.gz

[apple/xnu.git] / bsd / miscfs / nullfs / null_vfsops.c

diff --git a/bsd/miscfs/nullfs/null_vfsops.c b/bsd/miscfs/nullfs/null_vfsops.c
index ffcaa3d810e8969cbb589e4fe9e12e397ca8cbce..31aee40550cf379320e5747cb3ae5eefbb0ec214 100644 (file)
--- a/bsd/miscfs/nullfs/null_vfsops.c
+++ b/bsd/miscfs/nullfs/null_vfsops.c
@@ -3,19 +3,22 @@
  *
  * @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@
  */
@@ -205,27 +208,20 @@ nullfs_unmount(mp, mntflags, p)
        struct vnode *nullm_rootvp = MOUNTTONULLMOUNT(mp)->nullm_rootvp;
        int error;
        int flags = 0;
+       int force = 0;
 
 #ifdef NULLFS_DIAGNOSTIC
        printf("nullfs_unmount(mp = %x)\n", mp);
 #endif
 
-       if (mntflags & MNT_FORCE)
+       if (mntflags & MNT_FORCE) {
                flags |= FORCECLOSE;
+               force = 1;
+       }
 
-       /*
-        * Clear out buffer cache.  I don't think we
-        * ever get anything cached at this level at the
-        * moment, but who knows...
-        */
-#if 0
-       mntflushbuf(mp, 0); 
-       if (mntinvalbuf(mp, 1))
-               return (EBUSY);
-#endif
-       if (nullm_rootvp->v_usecount > 1)
+       if ( (nullm_rootvp->v_usecount > 1) && !force )
                return (EBUSY);
-       if (error = vflush(mp, nullm_rootvp, flags))
+       if ( (error = vflush(mp, nullm_rootvp, flags)) && !force )
                return (error);
 
 #ifdef NULLFS_DIAGNOSTIC