xnu-344.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..66f61af3de3907170b3a020f49c37ffdabbeddd5 100644 (file)
--- a/bsd/miscfs/nullfs/null_vfsops.c
+++ b/bsd/miscfs/nullfs/null_vfsops.c
@@ -205,27 +205,20 @@ nullfs_unmount(mp, mntflags, p)
        struct vnode *nullm_rootvp = MOUNTTONULLMOUNT(mp)->nullm_rootvp;
        int error;
        int flags = 0;
        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
 
 
 #ifdef NULLFS_DIAGNOSTIC
        printf("nullfs_unmount(mp = %x)\n", mp);
 #endif
 

-       if (mntflags & MNT_FORCE)
+       if (mntflags & MNT_FORCE) {

                flags |= FORCECLOSE;
                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);
                return (EBUSY);

-       if (error = vflush(mp, nullm_rootvp, flags))
+       if ( (error = vflush(mp, nullm_rootvp, flags)) && !force )

                return (error);
 
 #ifdef NULLFS_DIAGNOSTIC
                return (error);
 
 #ifdef NULLFS_DIAGNOSTIC