xnu-517.tar.gz

[apple/xnu.git] / bsd / miscfs / volfs / volfs_vfsops.c

diff --git a/bsd/miscfs/volfs/volfs_vfsops.c b/bsd/miscfs/volfs/volfs_vfsops.c
index 096873b7f73e5b2f686b04d21aef537c076527f2..4a2f6d964a26a3ed826dee84391670166b19b661 100644 (file)
--- a/bsd/miscfs/volfs/volfs_vfsops.c
+++ b/bsd/miscfs/volfs/volfs_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@
  */
@@ -39,7 +42,7 @@
 #include <sys/buf.h>
 #include <sys/mbuf.h>
 #include <sys/file.h>
-#include <dev/disk.h>
+#include <sys/disk.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
@@ -262,6 +265,8 @@ volfs_mount(mp, path, data, ndp, p)
     root_vp->v_data = priv_vn_data;
 
     priv_mnt_data->volfs_rootvp = root_vp;
+    
+    mp->mnt_flag &= ~MNT_RDONLY;
        
     return (0);
 }
@@ -400,6 +405,14 @@ volfs_sync(mp, waitfor, cred, p)
        struct proc *p;
 {
 //     DBG_VOP(("volfs_sync called\n"));
+
+    /* Release a few entries from the permissions cache to keep them from getting stale.
+     * Since sync is called at least every 30 seconds or so, releasing 1/20 of the cache
+     * every time through should free all entries in no less than 10 minutes, which should
+     * be adequate to prevent pid-wrapping from mis-associating PLC entries:
+     */
+    volfs_PLC_reclaim_entries(MAXPLCENTRIES / 20);
+    
        return 0;
 }
 /*
@@ -459,6 +472,9 @@ volfs_init(vfsp)
        struct vfsconf *vfsp;
 {
        DBG_VOP(("volfs_init called\n"));
+       
+    volfs_PLChashinit();
+       
        return (0);
 }