X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/fe8ab488e9161c46dd9885d58fc52996dc0249ff..e8c3f78193f1895ea514044358b93b1add9322f3:/bsd/vfs/vfs_init.c

diff --git a/bsd/vfs/vfs_init.c b/bsd/vfs/vfs_init.c
index 54b6880fc..bd44f3631 100644
--- a/bsd/vfs/vfs_init.c
+++ b/bsd/vfs/vfs_init.c
@@ -83,8 +83,8 @@
 #include <sys/ucred.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
+#include <sys/decmpfs.h>
 
-#include <vfs/vfs_journal.h>	/* journal_init() */
 #if CONFIG_MACF
 #include <security/mac_framework.h>
 #include <sys/kauth.h>
@@ -173,6 +173,13 @@ vfs_opv_init(void)
 		for (j=0; vfs_opv_descs[i]->opv_desc_ops[j].opve_op; j++) {
 			opve_descp = &(vfs_opv_descs[i]->opv_desc_ops[j]);
 
+			/* Silently skip known-disabled operations */
+			if (opve_descp->opve_op->vdesc_flags & VDESC_DISABLED) {
+				printf("vfs_fsadd: Ignoring reference in %p to disabled operation %s.\n",
+					vfs_opv_descs[i], opve_descp->opve_op->vdesc_name);
+				continue;
+			}
+
 			/*
 			 * Sanity check:  is this operation listed
 			 * in the list of operations?  We check this
@@ -191,8 +198,8 @@ vfs_opv_init(void)
 			 * list of supported operations.
 			 */
 			if (opve_descp->opve_op->vdesc_offset == 0 &&
-				    opve_descp->opve_op->vdesc_offset !=
-				    	VOFFSET(vnop_default)) {
+				    opve_descp->opve_op !=
+					VDESC(vnop_default)) {
 				printf("operation %s not listed in %s.\n",
 				    opve_descp->opve_op->vdesc_name,
 				    "vfs_op_descs");
@@ -244,6 +251,10 @@ vfs_op_init(void)
 	 * and assign each its offset.
 	 */
 	for (vfs_opv_numops = 0, i = 0; vfs_op_descs[i]; i++) {
+		/* Silently skip known-disabled operations */
+		if (vfs_op_descs[i]->vdesc_flags & VDESC_DISABLED) {
+			continue;
+		}
 		vfs_op_descs[i]->vdesc_offset = vfs_opv_numops;
 		vfs_opv_numops++;
 	}
@@ -402,12 +413,6 @@ vfsinit(void)
 	 */
 	nchinit();
 
-#if JOURNALING
-	/*
-	 * Initialize the journaling locks
-	 */
-	journal_init();
-#endif 
 	nspace_handler_init();
 
 	/*
@@ -501,6 +506,10 @@ vfsinit(void)
 	mac_mount_label_associate(vfs_context_kernel(), mp);
 #endif
 	dead_mountp = mp;
+
+#if FS_COMPRESSION
+	decmpfs_init();
+#endif
 }
 
 void
@@ -531,6 +540,7 @@ void
 mount_lock_init(mount_t mp)
 {
 	lck_mtx_init(&mp->mnt_mlock, mnt_lck_grp, mnt_lck_attr);
+	lck_mtx_init(&mp->mnt_iter_lock, 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);
 }
@@ -539,6 +549,7 @@ void
 mount_lock_destroy(mount_t mp)
 {
 	lck_mtx_destroy(&mp->mnt_mlock, mnt_lck_grp);
+	lck_mtx_destroy(&mp->mnt_iter_lock, mnt_lck_grp);
 	lck_mtx_destroy(&mp->mnt_renamelock, mnt_lck_grp);
 	lck_rw_destroy(&mp->mnt_rwlock, mnt_lck_grp);
 }