more ISOFS -> CD9660

SCCS-vsn: sys/kern/vfs_conf.c 8.6

diff --git a/usr/src/sys/kern/vfs_conf.c b/usr/src/sys/kern/vfs_conf.c
index 60a88ce..7a4cb32 100644 (file)
--- a/usr/src/sys/kern/vfs_conf.c
+++ b/usr/src/sys/kern/vfs_conf.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_conf.c  8.5 (Berkeley) %G%
+ *     @(#)vfs_conf.c  8.6 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -116,10 +116,10 @@ extern    struct vfsops afs_vfsops;
 #endif
 
 #ifdef CD9660
 #endif
 
 #ifdef CD9660

-extern struct vfsops isofs_vfsops;
-#define ISOFS_VFSOPS   &isofs_vfsops
+extern struct vfsops cd9660_vfsops;
+#define CD9660_VFSOPS  &cd9660_vfsops

 #else
 #else

-#define ISOFS_VFSOPS   NULL
+#define CD9660_VFSOPS  NULL

 #endif
 
 struct vfsops *vfssw[] = {
 #endif
 
 struct vfsops *vfssw[] = {


@@ -137,7 +137,7 @@ struct vfsops *vfssw[] = {
        KERNFS_VFSOPS,          /* 11 = MOUNT_KERNFS */
        PROCFS_VFSOPS,          /* 12 = MOUNT_PROCFS */
        AFS_VFSOPS,             /* 13 = MOUNT_AFS */
        KERNFS_VFSOPS,          /* 11 = MOUNT_KERNFS */
        PROCFS_VFSOPS,          /* 12 = MOUNT_PROCFS */
        AFS_VFSOPS,             /* 13 = MOUNT_AFS */

-       ISOFS_VFSOPS,           /* 14 = MOUNT_CD9660 */
+       CD9660_VFSOPS,          /* 14 = MOUNT_CD9660 */

        0
 };
 
        0
 };
 


@@ -169,9 +169,9 @@ extern struct vnodeopv_desc null_vnodeop_opv_desc;
 extern struct vnodeopv_desc umap_vnodeop_opv_desc;
 extern struct vnodeopv_desc kernfs_vnodeop_opv_desc;
 extern struct vnodeopv_desc procfs_vnodeop_opv_desc;
 extern struct vnodeopv_desc umap_vnodeop_opv_desc;
 extern struct vnodeopv_desc kernfs_vnodeop_opv_desc;
 extern struct vnodeopv_desc procfs_vnodeop_opv_desc;

-extern struct vnodeopv_desc isofs_vnodeop_opv_desc;
-extern struct vnodeopv_desc isofs_specop_opv_desc;
-extern struct vnodeopv_desc isofs_fifoop_opv_desc;
+extern struct vnodeopv_desc cd9660_vnodeop_opv_desc;
+extern struct vnodeopv_desc cd9660_specop_opv_desc;
+extern struct vnodeopv_desc cd9660_fifoop_opv_desc;

 
 struct vnodeopv_desc *vfs_opv_descs[] = {
        &ffs_vnodeop_opv_desc,
 
 struct vnodeopv_desc *vfs_opv_descs[] = {
        &ffs_vnodeop_opv_desc,


@@ -223,10 +223,10 @@ struct vnodeopv_desc *vfs_opv_descs[] = {
        &procfs_vnodeop_opv_desc,
 #endif
 #ifdef CD9660
        &procfs_vnodeop_opv_desc,
 #endif
 #ifdef CD9660

-       &isofs_vnodeop_opv_desc,
-       &isofs_specop_opv_desc,
+       &cd9660_vnodeop_opv_desc,
+       &cd9660_specop_opv_desc,

 #ifdef FIFO
 #ifdef FIFO

-       &isofs_fifoop_opv_desc,
+       &cd9660_fifoop_opv_desc,

 #endif
 #endif
        NULL
 #endif
 #endif
        NULL