isofs => cd9660 naming convention

SCCS-vsn: sys/isofs/cd9660/iso_rrip.h 8.2
SCCS-vsn: sys/isofs/cd9660/cd9660_lookup.c 8.2
SCCS-vsn: sys/isofs/cd9660/cd9660_node.h 8.2
SCCS-vsn: sys/isofs/cd9660/cd9660_node.c 8.2
SCCS-vsn: sys/isofs/cd9660/cd9660_rrip.c 8.2
SCCS-vsn: sys/isofs/cd9660/iso.h 8.2
SCCS-vsn: sys/isofs/cd9660/cd9660_vnops.c 8.3
SCCS-vsn: sys/isofs/cd9660/cd9660_bmap.c 8.3
SCCS-vsn: sys/isofs/cd9660/cd9660_vfsops.c 8.2

diff --git a/usr/src/sys/isofs/cd9660/cd9660_bmap.c b/usr/src/sys/isofs/cd9660/cd9660_bmap.c
index 644b149..0d4fd86 100644 (file)
--- a/usr/src/sys/isofs/cd9660/cd9660_bmap.c
+++ b/usr/src/sys/isofs/cd9660/cd9660_bmap.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)cd9660_bmap.c       8.2 (Berkeley) %G%
+ *     @(#)cd9660_bmap.c       8.3 (Berkeley) %G%

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


@@ -20,7 +20,7 @@
 #include <sys/mount.h>
 
 #include <isofs/cd9660/iso.h>
 #include <sys/mount.h>
 
 #include <isofs/cd9660/iso.h>

-#include <isofs/cd9660/isofs_node.h>
+#include <isofs/cd9660/cd9660_node.h>

 
 /*
  * Bmap converts a the logical block number of a file to its physical block
 
 /*
  * Bmap converts a the logical block number of a file to its physical block


@@ -28,7 +28,7 @@
  * number to index into the data block (extent) for the file.
  */
 int
  * number to index into the data block (extent) for the file.
  */
 int

-isofs_bmap(ap)
+cd9660_bmap(ap)

        struct vop_bmap_args /* {
                struct vnode *a_vp;
                daddr_t  a_bn;
        struct vop_bmap_args /* {
                struct vnode *a_vp;
                daddr_t  a_bn;

diff --git a/usr/src/sys/isofs/cd9660/cd9660_lookup.c b/usr/src/sys/isofs/cd9660/cd9660_lookup.c
index 8e84ae7..cf1db81 100644 (file)
--- a/usr/src/sys/isofs/cd9660/cd9660_lookup.c
+++ b/usr/src/sys/isofs/cd9660/cd9660_lookup.c
@@ -11,7 +11,7 @@
  *
  *     from: @(#)ufs_lookup.c  7.33 (Berkeley) 5/19/91
  *
  *
  *     from: @(#)ufs_lookup.c  7.33 (Berkeley) 5/19/91
  *

- *     @(#)cd9660_lookup.c     8.1 (Berkeley) %G%
+ *     @(#)cd9660_lookup.c     8.2 (Berkeley) %G%

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


@@ -22,9 +22,9 @@
 #include <sys/mount.h>
 
 #include <isofs/cd9660/iso.h>
 #include <sys/mount.h>
 
 #include <isofs/cd9660/iso.h>

-#include <isofs/cd9660/isofs_node.h>
+#include <isofs/cd9660/cd9660_node.h>

 #include <isofs/cd9660/iso_rrip.h>
 #include <isofs/cd9660/iso_rrip.h>

-#include <isofs/cd9660/isofs_rrip.h>
+#include <isofs/cd9660/cd9660_rrip.h>

 
 struct nchstats iso_nchstats;
 
 
 struct nchstats iso_nchstats;
 


@@ -63,7 +63,7 @@ struct        nchstats iso_nchstats;
  *
  * NOTE: (LOOKUP | LOCKPARENT) currently returns the parent inode unlocked.
  */
  *
  * NOTE: (LOOKUP | LOCKPARENT) currently returns the parent inode unlocked.
  */

-isofs_lookup(ap)
+cd9660_lookup(ap)

        struct vop_lookup_args /* {
                struct vnode *a_dvp;
                struct vnode **a_vpp;
        struct vop_lookup_args /* {
                struct vnode *a_dvp;
                struct vnode **a_vpp;


@@ -294,7 +294,7 @@ searchloop:
                        else
                                ino = dbtob(bp->b_blkno) + entryoffsetinblock;
                        dp->i_ino = ino;
                        else
                                ino = dbtob(bp->b_blkno) + entryoffsetinblock;
                        dp->i_ino = ino;

-                       isofs_rrip_getname(ep,altname,&namelen,&dp->i_ino,imp);
+                       cd9660_rrip_getname(ep,altname,&namelen,&dp->i_ino,imp);

                        if (namelen == cnp->cn_namelen
                            && !bcmp(name,altname,namelen))
                                goto found;
                        if (namelen == cnp->cn_namelen
                            && !bcmp(name,altname,namelen))
                                goto found;

diff --git a/usr/src/sys/isofs/cd9660/cd9660_node.c b/usr/src/sys/isofs/cd9660/cd9660_node.c
index 66d8119..0ecfa58 100644 (file)
--- a/usr/src/sys/isofs/cd9660/cd9660_node.c
+++ b/usr/src/sys/isofs/cd9660/cd9660_node.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)cd9660_node.c       8.1 (Berkeley) %G%
+ *     @(#)cd9660_node.c       8.2 (Berkeley) %G%

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


@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 
 #include <isofs/cd9660/iso.h>
 #include <sys/stat.h>
 
 #include <isofs/cd9660/iso.h>

-#include <isofs/cd9660/isofs_node.h>
+#include <isofs/cd9660/cd9660_node.h>

 #include <isofs/cd9660/iso_rrip.h>
 
 #define        INOHSZ  512
 #include <isofs/cd9660/iso_rrip.h>
 
 #define        INOHSZ  512


@@ -58,7 +58,7 @@ int prtactive;        /* 1 => print out reclaim of active vnodes */
 /*
  * Initialize hash links for inodes and dnodes.
  */
 /*
  * Initialize hash links for inodes and dnodes.
  */

-isofs_init()
+cd9660_init()

 {
        register int i;
        register union iso_ihead *ih = iso_ihead;
 {
        register int i;
        register union iso_ihead *ih = iso_ihead;


@@ -176,7 +176,7 @@ loop:
        /*
         * Allocate a new vnode/iso_node.
         */
        /*
         * Allocate a new vnode/iso_node.
         */

-       if (error = getnewvnode(VT_ISOFS, mntp, isofs_vnodeop_p, &nvp)) {
+       if (error = getnewvnode(VT_ISOFS, mntp, cd9660_vnodeop_p, &nvp)) {

                *ipp = 0;
                return error;
        }
                *ipp = 0;
                return error;
        }


@@ -240,11 +240,11 @@ loop:
                    && isonum_711(isodir->ext_attr_length))
                        iso_blkatoff(ip,-isonum_711(isodir->ext_attr_length),
                                     &bp2);
                    && isonum_711(isodir->ext_attr_length))
                        iso_blkatoff(ip,-isonum_711(isodir->ext_attr_length),
                                     &bp2);

-               isofs_defattr(isodir,ip,bp2 );
-               isofs_deftstamp(isodir,ip,bp2 );
+               cd9660_defattr(isodir,ip,bp2 );
+               cd9660_deftstamp(isodir,ip,bp2 );

                break;
        case ISO_FTYPE_RRIP:
                break;
        case ISO_FTYPE_RRIP:

-               result = isofs_rrip_analyze(isodir,ip,imp);
+               result = cd9660_rrip_analyze(isodir,ip,imp);

                break;
        }
        if (bp2)
                break;
        }
        if (bp2)


@@ -259,15 +259,15 @@ loop:
        
        if ( vp->v_type == VFIFO ) {
 #ifdef FIFO
        
        if ( vp->v_type == VFIFO ) {
 #ifdef FIFO

-               extern int (**isofs_fifoop_p)();
-               vp->v_op = isofs_fifoop_p;
+               extern int (**cd9660_fifoop_p)();
+               vp->v_op = cd9660_fifoop_p;

 #else
                iso_iput(ip);
                *ipp = 0;
                return EOPNOTSUPP;
 #endif /* FIFO */
        } else if ( vp->v_type == VCHR || vp->v_type == VBLK ) {
 #else
                iso_iput(ip);
                *ipp = 0;
                return EOPNOTSUPP;
 #endif /* FIFO */
        } else if ( vp->v_type == VCHR || vp->v_type == VBLK ) {

-               extern int (**isofs_specop_p)();
+               extern int (**cd9660_specop_p)();

 
                /*
                 * if device, look at device number table for translation
 
                /*
                 * if device, look at device number table for translation


@@ -276,7 +276,7 @@ loop:
                if (dp = iso_dmap(dev,ino,0))
                        ip->inode.iso_rdev = dp->d_dev;
 #endif
                if (dp = iso_dmap(dev,ino,0))
                        ip->inode.iso_rdev = dp->d_dev;
 #endif

-               vp->v_op = isofs_specop_p;
+               vp->v_op = cd9660_specop_p;

                if (nvp = checkalias(vp, ip->inode.iso_rdev, mntp)) {
                        /*
                         * Reinitialize aliased inode.
                if (nvp = checkalias(vp, ip->inode.iso_rdev, mntp)) {
                        /*
                         * Reinitialize aliased inode.


@@ -327,7 +327,7 @@ iso_iput(ip)
  * truncate and deallocate the file.
  */
 int
  * truncate and deallocate the file.
  */
 int

-isofs_inactive(ap)
+cd9660_inactive(ap)

        struct vop_inactive_args /* {
                struct vnode *a_vp;
        } */ *ap;
        struct vop_inactive_args /* {
                struct vnode *a_vp;
        } */ *ap;


@@ -337,7 +337,7 @@ isofs_inactive(ap)
        int mode, error = 0;
        
        if (prtactive && vp->v_usecount != 0)
        int mode, error = 0;
        
        if (prtactive && vp->v_usecount != 0)

-               vprint("isofs_inactive: pushing active", vp);
+               vprint("cd9660_inactive: pushing active", vp);

        
        ip->i_flag = 0;
        /*
        
        ip->i_flag = 0;
        /*


@@ -353,7 +353,7 @@ isofs_inactive(ap)
  * Reclaim an inode so that it can be used for other purposes.
  */
 int
  * Reclaim an inode so that it can be used for other purposes.
  */
 int

-isofs_reclaim(ap)
+cd9660_reclaim(ap)

        struct vop_reclaim_args /* {
                struct vnode *a_vp;
        } */ *ap;
        struct vop_reclaim_args /* {
                struct vnode *a_vp;
        } */ *ap;


@@ -363,7 +363,7 @@ isofs_reclaim(ap)
        int i;
        
        if (prtactive && vp->v_usecount != 0)
        int i;
        
        if (prtactive && vp->v_usecount != 0)

-               vprint("isofs_reclaim: pushing active", vp);
+               vprint("cd9660_reclaim: pushing active", vp);

        /*
         * Remove the inode from its hash chain.
         */
        /*
         * Remove the inode from its hash chain.
         */


@@ -423,7 +423,7 @@ iso_iunlock(ip)
  * File attributes
  */
 void
  * File attributes
  */
 void

-isofs_defattr(isodir,inop,bp)
+cd9660_defattr(isodir,inop,bp)

        struct iso_directory_record *isodir;
        struct iso_node *inop;
        struct buf *bp;
        struct iso_directory_record *isodir;
        struct iso_node *inop;
        struct buf *bp;


@@ -484,7 +484,7 @@ isofs_defattr(isodir,inop,bp)
  * Time stamps
  */
 void
  * Time stamps
  */
 void

-isofs_deftstamp(isodir,inop,bp)
+cd9660_deftstamp(isodir,inop,bp)

        struct iso_directory_record *isodir;
        struct iso_node *inop;
        struct buf *bp;
        struct iso_directory_record *isodir;
        struct iso_node *inop;
        struct buf *bp;


@@ -504,17 +504,17 @@ isofs_deftstamp(isodir,inop,bp)
                ap = (struct iso_extended_attributes *)bp->b_un.b_addr;
                
                if (isonum_711(ap->version) == 1) {
                ap = (struct iso_extended_attributes *)bp->b_un.b_addr;
                
                if (isonum_711(ap->version) == 1) {

-                       if (!isofs_tstamp_conv17(ap->ftime,&inop->inode.iso_atime))
-                               isofs_tstamp_conv17(ap->ctime,&inop->inode.iso_atime);
-                       if (!isofs_tstamp_conv17(ap->ctime,&inop->inode.iso_ctime))
+                       if (!cd9660_tstamp_conv17(ap->ftime,&inop->inode.iso_atime))
+                               cd9660_tstamp_conv17(ap->ctime,&inop->inode.iso_atime);
+                       if (!cd9660_tstamp_conv17(ap->ctime,&inop->inode.iso_ctime))

                                inop->inode.iso_ctime = inop->inode.iso_atime;
                                inop->inode.iso_ctime = inop->inode.iso_atime;

-                       if (!isofs_tstamp_conv17(ap->mtime,&inop->inode.iso_mtime))
+                       if (!cd9660_tstamp_conv17(ap->mtime,&inop->inode.iso_mtime))

                                inop->inode.iso_mtime = inop->inode.iso_ctime;
                } else
                        ap = NULL;
        }
        if (!ap) {
                                inop->inode.iso_mtime = inop->inode.iso_ctime;
                } else
                        ap = NULL;
        }
        if (!ap) {

-               isofs_tstamp_conv7(isodir->date,&inop->inode.iso_ctime);
+               cd9660_tstamp_conv7(isodir->date,&inop->inode.iso_ctime);

                inop->inode.iso_atime = inop->inode.iso_ctime;
                inop->inode.iso_mtime = inop->inode.iso_ctime;
        }
                inop->inode.iso_atime = inop->inode.iso_ctime;
                inop->inode.iso_mtime = inop->inode.iso_ctime;
        }


@@ -523,7 +523,7 @@ isofs_deftstamp(isodir,inop,bp)
 }
 
 int
 }
 
 int

-isofs_tstamp_conv7(pi,pu)
+cd9660_tstamp_conv7(pi,pu)

 char *pi;
 struct timeval *pu;
 {
 char *pi;
 struct timeval *pu;
 {


@@ -567,7 +567,7 @@ struct timeval *pu;
 }
 
 static unsigned
 }
 
 static unsigned

-isofs_chars2ui(begin,len)
+cd9660_chars2ui(begin,len)

        unsigned char *begin;
        int len;
 {
        unsigned char *begin;
        int len;
 {


@@ -581,34 +581,34 @@ isofs_chars2ui(begin,len)
 }
 
 int
 }
 
 int

-isofs_tstamp_conv17(pi,pu)
+cd9660_tstamp_conv17(pi,pu)

        unsigned char *pi;
        struct timeval *pu;
 {
        unsigned char buf[7];
        
        /* year:"0001"-"9999" -> -1900  */
        unsigned char *pi;
        struct timeval *pu;
 {
        unsigned char buf[7];
        
        /* year:"0001"-"9999" -> -1900  */

-       buf[0] = isofs_chars2ui(pi,4) - 1900;
+       buf[0] = cd9660_chars2ui(pi,4) - 1900;

        
        /* month: " 1"-"12"      -> 1 - 12 */
        
        /* month: " 1"-"12"      -> 1 - 12 */

-       buf[1] = isofs_chars2ui(pi + 4,2);
+       buf[1] = cd9660_chars2ui(pi + 4,2);

        
        /* day:   " 1"-"31"      -> 1 - 31 */
        
        /* day:   " 1"-"31"      -> 1 - 31 */

-       buf[2] = isofs_chars2ui(pi + 6,2);
+       buf[2] = cd9660_chars2ui(pi + 6,2);

        
        /* hour:  " 0"-"23"      -> 0 - 23 */
        
        /* hour:  " 0"-"23"      -> 0 - 23 */

-       buf[3] = isofs_chars2ui(pi + 8,2);
+       buf[3] = cd9660_chars2ui(pi + 8,2);

        
        /* minute:" 0"-"59"      -> 0 - 59 */
        
        /* minute:" 0"-"59"      -> 0 - 59 */

-       buf[4] = isofs_chars2ui(pi + 10,2);
+       buf[4] = cd9660_chars2ui(pi + 10,2);

        
        /* second:" 0"-"59"      -> 0 - 59 */
        
        /* second:" 0"-"59"      -> 0 - 59 */

-       buf[5] = isofs_chars2ui(pi + 12,2);
+       buf[5] = cd9660_chars2ui(pi + 12,2);

        
        /* difference of GMT */
        buf[6] = pi[16];
        
        
        /* difference of GMT */
        buf[6] = pi[16];
        

-       return isofs_tstamp_conv7(buf,pu);
+       return cd9660_tstamp_conv7(buf,pu);

 }
 
 void
 }
 
 void

diff --git a/usr/src/sys/isofs/cd9660/cd9660_node.h b/usr/src/sys/isofs/cd9660/cd9660_node.h
index 6cfdfb5..52053f1 100644 (file)
--- a/usr/src/sys/isofs/cd9660/cd9660_node.h
+++ b/usr/src/sys/isofs/cd9660/cd9660_node.h
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)cd9660_node.h       8.1 (Berkeley) %G%
+ *     @(#)cd9660_node.h       8.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -87,29 +87,29 @@ struct iso_node {
 /*
  * Prototypes for ISOFS vnode operations
  */
 /*
  * Prototypes for ISOFS vnode operations
  */

-int isofs_lookup __P((struct vop_lookup_args *));
-int isofs_open __P((struct vop_open_args *));
-int isofs_close __P((struct vop_close_args *));
-int isofs_access __P((struct vop_access_args *));
-int isofs_getattr __P((struct vop_getattr_args *));
-int isofs_read __P((struct vop_read_args *));
-int isofs_ioctl __P((struct vop_ioctl_args *));
-int isofs_select __P((struct vop_select_args *));
-int isofs_mmap __P((struct vop_mmap_args *));
-int isofs_seek __P((struct vop_seek_args *));
-int isofs_readdir __P((struct vop_readdir_args *));
-int isofs_abortop __P((struct vop_abortop_args *));
-int isofs_inactive __P((struct vop_inactive_args *));
-int isofs_reclaim __P((struct vop_reclaim_args *));
-int isofs_bmap __P((struct vop_bmap_args *));
-int isofs_lock __P((struct vop_lock_args *));
-int isofs_unlock __P((struct vop_unlock_args *));
-int isofs_strategy __P((struct vop_strategy_args *));
-int isofs_print __P((struct vop_print_args *));
-int isofs_islocked __P((struct vop_islocked_args *));
-void isofs_defattr __P((struct iso_directory_record *,
+int cd9660_lookup __P((struct vop_lookup_args *));
+int cd9660_open __P((struct vop_open_args *));
+int cd9660_close __P((struct vop_close_args *));
+int cd9660_access __P((struct vop_access_args *));
+int cd9660_getattr __P((struct vop_getattr_args *));
+int cd9660_read __P((struct vop_read_args *));
+int cd9660_ioctl __P((struct vop_ioctl_args *));
+int cd9660_select __P((struct vop_select_args *));
+int cd9660_mmap __P((struct vop_mmap_args *));
+int cd9660_seek __P((struct vop_seek_args *));
+int cd9660_readdir __P((struct vop_readdir_args *));
+int cd9660_abortop __P((struct vop_abortop_args *));
+int cd9660_inactive __P((struct vop_inactive_args *));
+int cd9660_reclaim __P((struct vop_reclaim_args *));
+int cd9660_bmap __P((struct vop_bmap_args *));
+int cd9660_lock __P((struct vop_lock_args *));
+int cd9660_unlock __P((struct vop_unlock_args *));
+int cd9660_strategy __P((struct vop_strategy_args *));
+int cd9660_print __P((struct vop_print_args *));
+int cd9660_islocked __P((struct vop_islocked_args *));
+void cd9660_defattr __P((struct iso_directory_record *,

                        struct iso_node *, struct buf *));
                        struct iso_node *, struct buf *));

-void isofs_deftstamp __P((struct iso_directory_record *,
+void cd9660_deftstamp __P((struct iso_directory_record *,

                        struct iso_node *, struct buf *));
 #ifdef ISODEVMAP
 struct iso_dnode *iso_dmap __P((dev_t, ino_t, int));
                        struct iso_node *, struct buf *));
 #ifdef ISODEVMAP
 struct iso_dnode *iso_dmap __P((dev_t, ino_t, int));

diff --git a/usr/src/sys/isofs/cd9660/cd9660_rrip.c b/usr/src/sys/isofs/cd9660/cd9660_rrip.c
index 388b797..08c46b1 100644 (file)
--- a/usr/src/sys/isofs/cd9660/cd9660_rrip.c
+++ b/usr/src/sys/isofs/cd9660/cd9660_rrip.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)cd9660_rrip.c       8.1 (Berkeley) %G%
+ *     @(#)cd9660_rrip.c       8.2 (Berkeley) %G%

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


@@ -25,15 +25,15 @@
 #include <sys/time.h>
 
 #include <isofs/cd9660/iso.h>
 #include <sys/time.h>
 
 #include <isofs/cd9660/iso.h>

-#include <isofs/cd9660/isofs_node.h>
-#include <isofs/cd9660/isofs_rrip.h>
+#include <isofs/cd9660/cd9660_node.h>
+#include <isofs/cd9660/cd9660_rrip.h>

 #include <isofs/cd9660/iso_rrip.h>
 
 /*
  * POSIX file attribute
  */
 static int
 #include <isofs/cd9660/iso_rrip.h>
 
 /*
  * POSIX file attribute
  */
 static int

-isofs_rrip_attr(p,ana)
+cd9660_rrip_attr(p,ana)

        ISO_RRIP_ATTR *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ISO_RRIP_ATTR *p;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -46,20 +46,20 @@ isofs_rrip_attr(p,ana)
 }
 
 static void
 }
 
 static void

-isofs_rrip_defattr(isodir,ana)
+cd9660_rrip_defattr(isodir,ana)

        struct iso_directory_record *isodir;
        ISO_RRIP_ANALYZE *ana;
 {
        /* But this is a required field! */
        printf("RRIP without PX field?\n");
        struct iso_directory_record *isodir;
        ISO_RRIP_ANALYZE *ana;
 {
        /* But this is a required field! */
        printf("RRIP without PX field?\n");

-       isofs_defattr(isodir,ana->inop,NULL);
+       cd9660_defattr(isodir,ana->inop,NULL);

 }
 
 /*
  * Symbolic Links
  */
 static int
 }
 
 /*
  * Symbolic Links
  */
 static int

-isofs_rrip_slink(p,ana)
+cd9660_rrip_slink(p,ana)

        ISO_RRIP_SLINK  *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ISO_RRIP_SLINK  *p;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -170,7 +170,7 @@ isofs_rrip_slink(p,ana)
  * Alternate name
  */
 static int
  * Alternate name
  */
 static int

-isofs_rrip_altname(p,ana)
+cd9660_rrip_altname(p,ana)

        ISO_RRIP_ALTNAME *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ISO_RRIP_ALTNAME *p;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -233,7 +233,7 @@ isofs_rrip_altname(p,ana)
 }
 
 static void
 }
 
 static void

-isofs_rrip_defname(isodir,ana)
+cd9660_rrip_defname(isodir,ana)

        struct iso_directory_record *isodir;
        ISO_RRIP_ANALYZE *ana;
 {
        struct iso_directory_record *isodir;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -257,7 +257,7 @@ isofs_rrip_defname(isodir,ana)
  * Parent or Child Link
  */
 static int
  * Parent or Child Link
  */
 static int

-isofs_rrip_pclink(p,ana)
+cd9660_rrip_pclink(p,ana)

        ISO_RRIP_CLINK  *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ISO_RRIP_CLINK  *p;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -270,7 +270,7 @@ isofs_rrip_pclink(p,ana)
  * Relocated directory
  */
 static int
  * Relocated directory
  */
 static int

-isofs_rrip_reldir(p,ana)
+cd9660_rrip_reldir(p,ana)

        ISO_RRIP_RELDIR  *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ISO_RRIP_RELDIR  *p;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -281,7 +281,7 @@ isofs_rrip_reldir(p,ana)
 }
 
 static int
 }
 
 static int

-isofs_rrip_tstamp(p,ana)
+cd9660_rrip_tstamp(p,ana)

        ISO_RRIP_TSTAMP *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ISO_RRIP_TSTAMP *p;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -295,19 +295,19 @@ isofs_rrip_tstamp(p,ana)
                        ptime += 7;
                
                if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) {
                        ptime += 7;
                
                if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) {

-                       isofs_tstamp_conv7(ptime,&ana->inop->inode.iso_mtime);
+                       cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_mtime);

                        ptime += 7;
                } else
                        bzero(&ana->inop->inode.iso_mtime,sizeof(struct timeval));
                
                if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
                        ptime += 7;
                } else
                        bzero(&ana->inop->inode.iso_mtime,sizeof(struct timeval));
                
                if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {

-                       isofs_tstamp_conv7(ptime,&ana->inop->inode.iso_atime);
+                       cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_atime);

                        ptime += 7;
                } else
                        ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime;
                
                if (*p->flags&ISO_SUSP_TSTAMP_ATTR)
                        ptime += 7;
                } else
                        ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime;
                
                if (*p->flags&ISO_SUSP_TSTAMP_ATTR)

-                       isofs_tstamp_conv7(ptime,&ana->inop->inode.iso_ctime);
+                       cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_ctime);

                else
                        ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
                
                else
                        ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
                


@@ -316,19 +316,19 @@ isofs_rrip_tstamp(p,ana)
                        ptime += 17;
                
                if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) {
                        ptime += 17;
                
                if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) {

-                       isofs_tstamp_conv17(ptime,&ana->inop->inode.iso_mtime);
+                       cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_mtime);

                        ptime += 17;
                } else
                        bzero(&ana->inop->inode.iso_mtime,sizeof(struct timeval));
                
                if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
                        ptime += 17;
                } else
                        bzero(&ana->inop->inode.iso_mtime,sizeof(struct timeval));
                
                if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {

-                       isofs_tstamp_conv17(ptime,&ana->inop->inode.iso_atime);
+                       cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_atime);

                        ptime += 17;
                } else
                        ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime;
                
                if (*p->flags&ISO_SUSP_TSTAMP_ATTR)
                        ptime += 17;
                } else
                        ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime;
                
                if (*p->flags&ISO_SUSP_TSTAMP_ATTR)

-                       isofs_tstamp_conv17(ptime,&ana->inop->inode.iso_ctime);
+                       cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_ctime);

                else
                        ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
                
                else
                        ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
                


@@ -338,18 +338,18 @@ isofs_rrip_tstamp(p,ana)
 }
 
 static void
 }
 
 static void

-isofs_rrip_deftstamp(isodir,ana)
+cd9660_rrip_deftstamp(isodir,ana)

        struct iso_directory_record  *isodir;
        ISO_RRIP_ANALYZE *ana;
 {
        struct iso_directory_record  *isodir;
        ISO_RRIP_ANALYZE *ana;
 {

-       isofs_deftstamp(isodir,ana->inop,NULL);
+       cd9660_deftstamp(isodir,ana->inop,NULL);

 }
 
 /*
  * POSIX device modes
  */
 static int
 }
 
 /*
  * POSIX device modes
  */
 static int

-isofs_rrip_device(p,ana)
+cd9660_rrip_device(p,ana)

        ISO_RRIP_DEVICE *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ISO_RRIP_DEVICE *p;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -371,14 +371,14 @@ isofs_rrip_device(p,ana)
  * Flag indicating
  */
 static int
  * Flag indicating
  */
 static int

-isofs_rrip_idflag(p,ana)
+cd9660_rrip_idflag(p,ana)

        ISO_RRIP_IDFLAG *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ana->fields &= isonum_711(p->flags)|~0xff; /* don't touch high bits */
        /* special handling of RE field */
        if (ana->fields&ISO_SUSP_RELDIR)
        ISO_RRIP_IDFLAG *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ana->fields &= isonum_711(p->flags)|~0xff; /* don't touch high bits */
        /* special handling of RE field */
        if (ana->fields&ISO_SUSP_RELDIR)

-               return isofs_rrip_reldir(p,ana);
+               return cd9660_rrip_reldir(p,ana);

        
        return ISO_SUSP_IDFLAG;
 }
        
        return ISO_SUSP_IDFLAG;
 }


@@ -387,7 +387,7 @@ isofs_rrip_idflag(p,ana)
  * Continuation pointer
  */
 static int
  * Continuation pointer
  */
 static int

-isofs_rrip_cont(p,ana)
+cd9660_rrip_cont(p,ana)

        ISO_RRIP_CONT *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ISO_RRIP_CONT *p;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -401,7 +401,7 @@ isofs_rrip_cont(p,ana)
  * System Use end
  */
 static int
  * System Use end
  */
 static int

-isofs_rrip_stop(p,ana)
+cd9660_rrip_stop(p,ana)

        ISO_SUSP_HEADER *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ISO_SUSP_HEADER *p;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -414,7 +414,7 @@ isofs_rrip_stop(p,ana)
  * Extension reference
  */
 static int
  * Extension reference
  */
 static int

-isofs_rrip_extref(p,ana)
+cd9660_rrip_extref(p,ana)

        ISO_RRIP_EXTREF *p;
        ISO_RRIP_ANALYZE *ana;
 {
        ISO_RRIP_EXTREF *p;
        ISO_RRIP_ANALYZE *ana;
 {


@@ -434,7 +434,7 @@ typedef struct {
 } RRIP_TABLE;
 
 static int
 } RRIP_TABLE;
 
 static int

-isofs_rrip_loop(isodir,ana,table)
+cd9660_rrip_loop(isodir,ana,table)

        struct iso_directory_record *isodir;
        ISO_RRIP_ANALYZE *ana;
        RRIP_TABLE *table;
        struct iso_directory_record *isodir;
        ISO_RRIP_ANALYZE *ana;
        RRIP_TABLE *table;


@@ -517,17 +517,17 @@ isofs_rrip_loop(isodir,ana,table)
 }
 
 static RRIP_TABLE rrip_table_analyze[] = {
 }
 
 static RRIP_TABLE rrip_table_analyze[] = {

-       { "PX", isofs_rrip_attr,        isofs_rrip_defattr,     ISO_SUSP_ATTR },
-       { "TF", isofs_rrip_tstamp,      isofs_rrip_deftstamp,   ISO_SUSP_TSTAMP },
-       { "PN", isofs_rrip_device,      0,                      ISO_SUSP_DEVICE },
-       { "RR", isofs_rrip_idflag,      0,                      ISO_SUSP_IDFLAG },
-       { "CE", isofs_rrip_cont,        0,                      ISO_SUSP_CONT },
-       { "ST", isofs_rrip_stop,        0,                      ISO_SUSP_STOP },
+       { "PX", cd9660_rrip_attr,       cd9660_rrip_defattr,    ISO_SUSP_ATTR },
+       { "TF", cd9660_rrip_tstamp,     cd9660_rrip_deftstamp,  ISO_SUSP_TSTAMP },
+       { "PN", cd9660_rrip_device,     0,                      ISO_SUSP_DEVICE },
+       { "RR", cd9660_rrip_idflag,     0,                      ISO_SUSP_IDFLAG },
+       { "CE", cd9660_rrip_cont,       0,                      ISO_SUSP_CONT },
+       { "ST", cd9660_rrip_stop,       0,                      ISO_SUSP_STOP },

        { "",   0,                      0,                      0 }
 };
 
 int
        { "",   0,                      0,                      0 }
 };
 
 int

-isofs_rrip_analyze(isodir,inop,imp)
+cd9660_rrip_analyze(isodir,inop,imp)

        struct iso_directory_record *isodir;
        struct iso_node *inop;
        struct iso_mnt *imp;
        struct iso_directory_record *isodir;
        struct iso_node *inop;
        struct iso_mnt *imp;


@@ -538,7 +538,7 @@ isofs_rrip_analyze(isodir,inop,imp)
        analyze.imp = imp;
        analyze.fields = ISO_SUSP_ATTR|ISO_SUSP_TSTAMP|ISO_SUSP_DEVICE;
        
        analyze.imp = imp;
        analyze.fields = ISO_SUSP_ATTR|ISO_SUSP_TSTAMP|ISO_SUSP_DEVICE;
        

-       return isofs_rrip_loop(isodir,&analyze,rrip_table_analyze);
+       return cd9660_rrip_loop(isodir,&analyze,rrip_table_analyze);

 }
 
 /* 
 }
 
 /* 


@@ -547,18 +547,18 @@ isofs_rrip_analyze(isodir,inop,imp)
  *    it will be return the translated ISO9660 name,
  */
 static RRIP_TABLE rrip_table_getname[] = {
  *    it will be return the translated ISO9660 name,
  */
 static RRIP_TABLE rrip_table_getname[] = {

-       { "NM", isofs_rrip_altname,     isofs_rrip_defname,     ISO_SUSP_ALTNAME },
-       { "CL", isofs_rrip_pclink,      0,                      ISO_SUSP_CLINK|ISO_SUSP_PLINK },
-       { "PL", isofs_rrip_pclink,      0,                      ISO_SUSP_CLINK|ISO_SUSP_PLINK },
-       { "RE", isofs_rrip_reldir,      0,                      ISO_SUSP_RELDIR },
-       { "RR", isofs_rrip_idflag,      0,                      ISO_SUSP_IDFLAG },
-       { "CE", isofs_rrip_cont,        0,                      ISO_SUSP_CONT },
-       { "ST", isofs_rrip_stop,        0,                      ISO_SUSP_STOP },
+       { "NM", cd9660_rrip_altname,    cd9660_rrip_defname,    ISO_SUSP_ALTNAME },
+       { "CL", cd9660_rrip_pclink,     0,                      ISO_SUSP_CLINK|ISO_SUSP_PLINK },
+       { "PL", cd9660_rrip_pclink,     0,                      ISO_SUSP_CLINK|ISO_SUSP_PLINK },
+       { "RE", cd9660_rrip_reldir,     0,                      ISO_SUSP_RELDIR },
+       { "RR", cd9660_rrip_idflag,     0,                      ISO_SUSP_IDFLAG },
+       { "CE", cd9660_rrip_cont,       0,                      ISO_SUSP_CONT },
+       { "ST", cd9660_rrip_stop,       0,                      ISO_SUSP_STOP },

        { "",   0,                      0,                      0 }
 };
 
 int
        { "",   0,                      0,                      0 }
 };
 
 int

-isofs_rrip_getname(isodir,outbuf,outlen,inump,imp)
+cd9660_rrip_getname(isodir,outbuf,outlen,inump,imp)

        struct iso_directory_record *isodir;
        char *outbuf;
        u_short *outlen;
        struct iso_directory_record *isodir;
        char *outbuf;
        u_short *outlen;


@@ -579,13 +579,13 @@ isofs_rrip_getname(isodir,outbuf,outlen,inump,imp)
        tab = rrip_table_getname;
        if (*isodir->name == 0
            || *isodir->name == 1) {
        tab = rrip_table_getname;
        if (*isodir->name == 0
            || *isodir->name == 1) {

-               isofs_rrip_defname(isodir,&analyze);
+               cd9660_rrip_defname(isodir,&analyze);

                
                analyze.fields &= ~ISO_SUSP_ALTNAME;
                tab++;
        }
        
                
                analyze.fields &= ~ISO_SUSP_ALTNAME;
                tab++;
        }
        

-       return isofs_rrip_loop(isodir,&analyze,tab);
+       return cd9660_rrip_loop(isodir,&analyze,tab);

 }
 
 /* 
 }
 
 /* 


@@ -594,15 +594,15 @@ isofs_rrip_getname(isodir,outbuf,outlen,inump,imp)
  * Note: isodir should contains SL record!
  */
 static RRIP_TABLE rrip_table_getsymname[] = {
  * Note: isodir should contains SL record!
  */
 static RRIP_TABLE rrip_table_getsymname[] = {

-       { "SL", isofs_rrip_slink,       0,                      ISO_SUSP_SLINK },
-       { "RR", isofs_rrip_idflag,      0,                      ISO_SUSP_IDFLAG },
-       { "CE", isofs_rrip_cont,        0,                      ISO_SUSP_CONT },
-       { "ST", isofs_rrip_stop,        0,                      ISO_SUSP_STOP },
+       { "SL", cd9660_rrip_slink,      0,                      ISO_SUSP_SLINK },
+       { "RR", cd9660_rrip_idflag,     0,                      ISO_SUSP_IDFLAG },
+       { "CE", cd9660_rrip_cont,       0,                      ISO_SUSP_CONT },
+       { "ST", cd9660_rrip_stop,       0,                      ISO_SUSP_STOP },

        { "",   0,                      0,                      0 }
 };
 
 int
        { "",   0,                      0,                      0 }
 };
 
 int

-isofs_rrip_getsymname(isodir,outbuf,outlen,imp)
+cd9660_rrip_getsymname(isodir,outbuf,outlen,imp)

        struct iso_directory_record *isodir;
        char *outbuf;
        u_short *outlen;
        struct iso_directory_record *isodir;
        char *outbuf;
        u_short *outlen;


@@ -618,13 +618,13 @@ isofs_rrip_getsymname(isodir,outbuf,outlen,imp)
        analyze.imp = imp;
        analyze.fields = ISO_SUSP_SLINK;
        
        analyze.imp = imp;
        analyze.fields = ISO_SUSP_SLINK;
        

-       return (isofs_rrip_loop(isodir,&analyze,rrip_table_getsymname)&ISO_SUSP_SLINK);
+       return (cd9660_rrip_loop(isodir,&analyze,rrip_table_getsymname)&ISO_SUSP_SLINK);

 }
 
 static RRIP_TABLE rrip_table_extref[] = {
 }
 
 static RRIP_TABLE rrip_table_extref[] = {

-       { "ER", isofs_rrip_extref,      0,                      ISO_SUSP_EXTREF },
-       { "CE", isofs_rrip_cont,        0,                      ISO_SUSP_CONT },
-       { "ST", isofs_rrip_stop,        0,                      ISO_SUSP_STOP },
+       { "ER", cd9660_rrip_extref,     0,                      ISO_SUSP_EXTREF },
+       { "CE", cd9660_rrip_cont,       0,                      ISO_SUSP_CONT },
+       { "ST", cd9660_rrip_stop,       0,                      ISO_SUSP_STOP },

        { "",   0,                      0,                      0 }
 };
 
        { "",   0,                      0,                      0 }
 };
 


@@ -633,7 +633,7 @@ static RRIP_TABLE rrip_table_extref[] = {
  * Note: We require the ER field.
  */
 int
  * Note: We require the ER field.
  */
 int

-isofs_rrip_offset(isodir,imp)
+cd9660_rrip_offset(isodir,imp)

        struct iso_directory_record *isodir;
        struct iso_mnt *imp;
 {
        struct iso_directory_record *isodir;
        struct iso_mnt *imp;
 {


@@ -652,7 +652,7 @@ isofs_rrip_offset(isodir,imp)
        
        analyze.imp = imp;
        analyze.fields = ISO_SUSP_EXTREF;
        
        analyze.imp = imp;
        analyze.fields = ISO_SUSP_EXTREF;

-       if (!(isofs_rrip_loop(isodir,&analyze,rrip_table_extref)&ISO_SUSP_EXTREF))
+       if (!(cd9660_rrip_loop(isodir,&analyze,rrip_table_extref)&ISO_SUSP_EXTREF))

                return -1;
        
        return isonum_711(p->skip);
                return -1;
        
        return isonum_711(p->skip);

diff --git a/usr/src/sys/isofs/cd9660/cd9660_vfsops.c b/usr/src/sys/isofs/cd9660/cd9660_vfsops.c
index 17f69be..cdec2fb 100644 (file)
--- a/usr/src/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/usr/src/sys/isofs/cd9660/cd9660_vfsops.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)cd9660_vfsops.c     8.1 (Berkeley) %G%
+ *     @(#)cd9660_vfsops.c     8.2 (Berkeley) %G%

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


@@ -29,22 +29,22 @@
 #include <sys/malloc.h>
 
 #include <isofs/cd9660/iso.h>
 #include <sys/malloc.h>
 
 #include <isofs/cd9660/iso.h>

-#include <isofs/cd9660/isofs_node.h>
+#include <isofs/cd9660/cd9660_node.h>

 
 extern int enodev ();
 
 
 extern int enodev ();
 

-struct vfsops isofs_vfsops = {
-       isofs_mount,
-       isofs_start,
-       isofs_unmount,
-       isofs_root,
-       isofs_quotactl,
-       isofs_statfs,
-       isofs_sync,
-       isofs_vget,
-       isofs_fhtovp,
-       isofs_vptofh,
-       isofs_init,
+struct vfsops cd9660_vfsops = {
+       cd9660_mount,
+       cd9660_start,
+       cd9660_unmount,
+       cd9660_root,
+       cd9660_quotactl,
+       cd9660_statfs,
+       cd9660_sync,
+       cd9660_vget,
+       cd9660_fhtovp,
+       cd9660_vptofh,
+       cd9660_init,

 };
 
 /*
 };
 
 /*


@@ -56,7 +56,7 @@ struct vfsops isofs_vfsops = {
 
 static iso_mountfs();
 
 
 static iso_mountfs();
 

-isofs_mountroot()
+cd9660_mountroot()

 {
        register struct mount *mp;
        extern struct vnode *rootvp;
 {
        register struct mount *mp;
        extern struct vnode *rootvp;


@@ -71,11 +71,11 @@ isofs_mountroot()
         * Get vnodes for swapdev and rootdev.
         */
        if (bdevvp(swapdev, &swapdev_vp) || bdevvp(rootdev, &rootvp))
         * Get vnodes for swapdev and rootdev.
         */
        if (bdevvp(swapdev, &swapdev_vp) || bdevvp(rootdev, &rootvp))

-               panic("isofs_mountroot: can't setup bdevvp's");
+               panic("cd9660_mountroot: can't setup bdevvp's");

 
        mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
        bzero((char *)mp, (u_long)sizeof(struct mount));
 
        mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
        bzero((char *)mp, (u_long)sizeof(struct mount));

-       mp->mnt_op = &isofs_vfsops;
+       mp->mnt_op = &cd9660_vfsops;

        mp->mnt_flag = MNT_RDONLY;
        args.flags = ISOFSMNT_ROOT;
        if (error = iso_mountfs(rootvp, mp, p, &args)) {
        mp->mnt_flag = MNT_RDONLY;
        args.flags = ISOFSMNT_ROOT;
        if (error = iso_mountfs(rootvp, mp, p, &args)) {


@@ -83,7 +83,7 @@ isofs_mountroot()
                return (error);
        }
        if (error = vfs_lock(mp)) {
                return (error);
        }
        if (error = vfs_lock(mp)) {

-               (void)isofs_unmount(mp, 0, p);
+               (void)cd9660_unmount(mp, 0, p);

                free(mp, M_MOUNT);
                return (error);
        }
                free(mp, M_MOUNT);
                return (error);
        }


@@ -98,7 +98,7 @@ isofs_mountroot()
        (void) copystr(ROOTNAME, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
            &size);
        bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
        (void) copystr(ROOTNAME, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
            &size);
        bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);

-       (void) isofs_statfs(mp, &mp->mnt_stat, p);
+       (void) cd9660_statfs(mp, &mp->mnt_stat, p);

        vfs_unlock(mp);
        return (0);
 }
        vfs_unlock(mp);
        return (0);
 }


@@ -113,7 +113,7 @@ int iso_doforce = 1;
  *
  * mount system call
  */
  *
  * mount system call
  */

-isofs_mount(mp, path, data, ndp, p)
+cd9660_mount(mp, path, data, ndp, p)

        register struct mount *mp;
        char *path;
        caddr_t data;
        register struct mount *mp;
        char *path;
        caddr_t data;


@@ -178,7 +178,7 @@ isofs_mount(mp, path, data, ndp, p)
        (void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
            &size);
        bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
        (void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
            &size);
        bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);

-       (void) isofs_statfs(mp, &mp->mnt_stat, p);
+       (void) cd9660_statfs(mp, &mp->mnt_stat, p);

        return 0;
 }
 
        return 0;
 }
 


@@ -290,7 +290,7 @@ static iso_mountfs(devvp, mp, p, argp)
        
        mp->mnt_data = (qaddr_t)isomp;
        mp->mnt_stat.f_fsid.val[0] = (long)dev;
        
        mp->mnt_data = (qaddr_t)isomp;
        mp->mnt_stat.f_fsid.val[0] = (long)dev;

-       mp->mnt_stat.f_fsid.val[1] = MOUNT_ISOFS;
+       mp->mnt_stat.f_fsid.val[1] = MOUNT_CD9660;

        mp->mnt_maxsymlinklen = 0;
        mp->mnt_flag |= MNT_LOCAL;
        isomp->im_mountp = mp;
        mp->mnt_maxsymlinklen = 0;
        mp->mnt_flag |= MNT_LOCAL;
        isomp->im_mountp = mp;


@@ -309,7 +309,7 @@ static iso_mountfs(devvp, mp, p, argp)
                
                rootp = (struct iso_directory_record *)bp->b_un.b_addr;
                
                
                rootp = (struct iso_directory_record *)bp->b_un.b_addr;
                

-               if ((isomp->rr_skip = isofs_rrip_offset(rootp,isomp)) < 0) {
+               if ((isomp->rr_skip = cd9660_rrip_offset(rootp,isomp)) < 0) {

                    argp->flags  |= ISOFSMNT_NORRIP;
                } else {
                    argp->flags  &= ~ISOFSMNT_GENS;
                    argp->flags  |= ISOFSMNT_NORRIP;
                } else {
                    argp->flags  &= ~ISOFSMNT_GENS;


@@ -354,7 +354,7 @@ out:
  * Nothing to do at the moment.
  */
 /* ARGSUSED */
  * Nothing to do at the moment.
  */
 /* ARGSUSED */

-isofs_start(mp, flags, p)
+cd9660_start(mp, flags, p)

        struct mount *mp;
        int flags;
        struct proc *p;
        struct mount *mp;
        int flags;
        struct proc *p;


@@ -366,7 +366,7 @@ isofs_start(mp, flags, p)
  * unmount system call
  */
 int
  * unmount system call
  */
 int

-isofs_unmount(mp, mntflags, p)
+cd9660_unmount(mp, mntflags, p)

        struct mount *mp;
        int mntflags;
        struct proc *p;
        struct mount *mp;
        int mntflags;
        struct proc *p;


@@ -406,7 +406,7 @@ isofs_unmount(mp, mntflags, p)
 /*
  * Return root of a filesystem
  */
 /*
  * Return root of a filesystem
  */

-isofs_root(mp, vpp)
+cd9660_root(mp, vpp)

        struct mount *mp;
        struct vnode **vpp;
 {
        struct mount *mp;
        struct vnode **vpp;
 {


@@ -444,7 +444,7 @@ isofs_root(mp, vpp)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-isofs_quotactl(mp, cmd, uid, arg, p)
+cd9660_quotactl(mp, cmd, uid, arg, p)

        struct mount *mp;
        int cmd;
        uid_t uid;
        struct mount *mp;
        int cmd;
        uid_t uid;


@@ -458,7 +458,7 @@ isofs_quotactl(mp, cmd, uid, arg, p)
 /*
  * Get file system statistics.
  */
 /*
  * Get file system statistics.
  */

-isofs_statfs(mp, sbp, p)
+cd9660_statfs(mp, sbp, p)

        struct mount *mp;
        register struct statfs *sbp;
        struct proc *p;
        struct mount *mp;
        register struct statfs *sbp;
        struct proc *p;


@@ -468,7 +468,7 @@ isofs_statfs(mp, sbp, p)
        
        isomp = VFSTOISOFS(mp);
        
        
        isomp = VFSTOISOFS(mp);
        

-       sbp->f_type = MOUNT_ISOFS;
+       sbp->f_type = MOUNT_CD9660;

        sbp->f_bsize = isomp->logical_block_size;
        sbp->f_iosize = sbp->f_bsize;   /* XXX */
        sbp->f_blocks = isomp->volume_space_size;
        sbp->f_bsize = isomp->logical_block_size;
        sbp->f_iosize = sbp->f_bsize;   /* XXX */
        sbp->f_blocks = isomp->volume_space_size;


@@ -489,7 +489,7 @@ isofs_statfs(mp, sbp, p)
 
 /* ARGSUSED */
 int
 
 /* ARGSUSED */
 int

-isofs_sync(mp, waitfor, cred, p)
+cd9660_sync(mp, waitfor, cred, p)

        struct mount *mp;
        int waitfor;
        struct ucred *cred;
        struct mount *mp;
        int waitfor;
        struct ucred *cred;


@@ -504,7 +504,7 @@ isofs_sync(mp, waitfor, cred, p)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-isofs_vget(mp, ino, vpp)
+cd9660_vget(mp, ino, vpp)

        struct mount *mp;
        ino_t ino;
        struct vnode **vpp;
        struct mount *mp;
        ino_t ino;
        struct vnode **vpp;


@@ -532,7 +532,7 @@ struct ifid {
 
 /* ARGSUSED */
 int
 
 /* ARGSUSED */
 int

-isofs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
+cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)

        register struct mount *mp;
        struct fid *fhp;
        struct mbuf *nam;
        register struct mount *mp;
        struct fid *fhp;
        struct mbuf *nam;


@@ -632,7 +632,7 @@ isofs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
  * Vnode pointer to File handle
  */
 /* ARGSUSED */
  * Vnode pointer to File handle
  */
 /* ARGSUSED */

-isofs_vptofh(vp, fhp)
+cd9660_vptofh(vp, fhp)

        struct vnode *vp;
        struct fid *fhp;
 {
        struct vnode *vp;
        struct fid *fhp;
 {

diff --git a/usr/src/sys/isofs/cd9660/cd9660_vnops.c b/usr/src/sys/isofs/cd9660/cd9660_vnops.c
index 101f1bb..4a05e80 100644 (file)
--- a/usr/src/sys/isofs/cd9660/cd9660_vnops.c
+++ b/usr/src/sys/isofs/cd9660/cd9660_vnops.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)cd9660_vnops.c      8.2 (Berkeley) %G%
+ *     @(#)cd9660_vnops.c      8.3 (Berkeley) %G%

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


@@ -30,7 +30,7 @@
 #include <sys/dir.h>
 
 #include <isofs/cd9660/iso.h>
 #include <sys/dir.h>
 
 #include <isofs/cd9660/iso.h>

-#include <isofs/cd9660/isofs_node.h>
+#include <isofs/cd9660/cd9660_node.h>

 #include <isofs/cd9660/iso_rrip.h>
 
 #if 0
 #include <isofs/cd9660/iso_rrip.h>
 
 #if 0


@@ -38,7 +38,7 @@
  * Mknod vnode call
  *  Actually remap the device number
  */
  * Mknod vnode call
  *  Actually remap the device number
  */

-isofs_mknod(ndp, vap, cred, p)
+cd9660_mknod(ndp, vap, cred, p)

        struct nameidata *ndp;
        struct ucred *cred;
        struct vattr *vap;
        struct nameidata *ndp;
        struct ucred *cred;
        struct vattr *vap;


@@ -96,7 +96,7 @@ isofs_mknod(ndp, vap, cred, p)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-isofs_open(ap)
+cd9660_open(ap)

        struct vop_open_args /* {
                struct vnode *a_vp;
                int  a_mode;
        struct vop_open_args /* {
                struct vnode *a_vp;
                int  a_mode;


@@ -114,7 +114,7 @@ isofs_open(ap)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-isofs_close(ap)
+cd9660_close(ap)

        struct vop_close_args /* {
                struct vnode *a_vp;
                int  a_fflag;
        struct vop_close_args /* {
                struct vnode *a_vp;
                int  a_fflag;


@@ -131,7 +131,7 @@ isofs_close(ap)
  * super user is granted all permissions.
  */
 /* ARGSUSED */
  * super user is granted all permissions.
  */
 /* ARGSUSED */

-isofs_access(ap)
+cd9660_access(ap)

        struct vop_access_args /* {
                struct vnode *a_vp;
                int  a_mode;
        struct vop_access_args /* {
                struct vnode *a_vp;
                int  a_mode;


@@ -142,7 +142,7 @@ isofs_access(ap)
        return (0);
 }
 
        return (0);
 }
 

-isofs_getattr(ap)
+cd9660_getattr(ap)

        struct vop_getattr_args /* {
                struct vnode *a_vp;
                struct vattr *a_vap;
        struct vop_getattr_args /* {
                struct vnode *a_vp;
                struct vattr *a_vap;


@@ -191,7 +191,7 @@ extern int doclusterread;
 /*
  * Vnode op for reading.
  */
 /*
  * Vnode op for reading.
  */

-isofs_read(ap)
+cd9660_read(ap)

        struct vop_read_args /* {
                struct vnode *a_vp;
                struct uio *a_uio;
        struct vop_read_args /* {
                struct vnode *a_vp;
                struct uio *a_uio;


@@ -260,7 +260,7 @@ isofs_read(ap)
 
 /* ARGSUSED */
 int
 
 /* ARGSUSED */
 int

-isofs_ioctl(ap)
+cd9660_ioctl(ap)

        struct vop_ioctl_args /* {
                struct vnode *a_vp;
                int  a_command;
        struct vop_ioctl_args /* {
                struct vnode *a_vp;
                int  a_command;


@@ -276,7 +276,7 @@ isofs_ioctl(ap)
 
 /* ARGSUSED */
 int
 
 /* ARGSUSED */
 int

-isofs_select(ap)
+cd9660_select(ap)

        struct vop_select_args /* {
                struct vnode *a_vp;
                int  a_which;
        struct vop_select_args /* {
                struct vnode *a_vp;
                int  a_which;


@@ -299,7 +299,7 @@ isofs_select(ap)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-isofs_mmap(ap)
+cd9660_mmap(ap)

        struct vop_mmap_args /* {
                struct vnode *a_vp;
                int  a_fflags;
        struct vop_mmap_args /* {
                struct vnode *a_vp;
                int  a_fflags;


@@ -318,7 +318,7 @@ isofs_mmap(ap)
  */
 /* ARGSUSED */
 int
  */
 /* ARGSUSED */
 int

-isofs_seek(ap)
+cd9660_seek(ap)

        struct vop_seek_args /* {
                struct vnode *a_vp;
                off_t  a_oldoff;
        struct vop_seek_args /* {
                struct vnode *a_vp;
                off_t  a_oldoff;


@@ -434,7 +434,7 @@ iso_shipdir(idp)
  * are no longer args.
  */
 int
  * are no longer args.
  */
 int

-isofs_readdir(ap)
+cd9660_readdir(ap)

        struct vop_readdir_args /* {
                struct vnode *a_vp;
                struct uio *a_uio;
        struct vop_readdir_args /* {
                struct vnode *a_vp;
                struct uio *a_uio;


@@ -539,7 +539,7 @@ isofs_readdir(ap)
                 */
                switch (imp->iso_ftype) {
                case ISO_FTYPE_RRIP:
                 */
                switch (imp->iso_ftype) {
                case ISO_FTYPE_RRIP:

-                       isofs_rrip_getname(ep,idp->current.d_name,
+                       cd9660_rrip_getname(ep,idp->current.d_name,

                                           (u_short *)&idp->current.d_namlen,
                                           &idp->current.d_fileno,imp);
                        if (idp->current.d_namlen)
                                           (u_short *)&idp->current.d_namlen,
                                           &idp->current.d_fileno,imp);
                        if (idp->current.d_namlen)


@@ -598,14 +598,14 @@ isofs_readdir(ap)
 /*
  * Return target name of a symbolic link
  * Shouldn't we get the parent vnode and read the data from there?
 /*
  * Return target name of a symbolic link
  * Shouldn't we get the parent vnode and read the data from there?

- * This could eventually result in deadlocks in isofs_lookup.
+ * This could eventually result in deadlocks in cd9660_lookup.

  * But otherwise the block read here is in the block buffer two times.
  */
 typedef struct iso_directory_record ISODIR;
 typedef struct iso_node             ISONODE;
 typedef struct iso_mnt              ISOMNT;
 int
  * But otherwise the block read here is in the block buffer two times.
  */
 typedef struct iso_directory_record ISODIR;
 typedef struct iso_node             ISONODE;
 typedef struct iso_mnt              ISOMNT;
 int

-isofs_readlink(ap)
+cd9660_readlink(ap)

        struct vop_readlink_args /* {
                struct vnode *a_vp;
                struct uio *a_uio;
        struct vop_readlink_args /* {
                struct vnode *a_vp;
                struct uio *a_uio;


@@ -675,7 +675,7 @@ isofs_readlink(ap)
        /*
         * Ok, we just gathering a symbolic name in SL record.
         */
        /*
         * Ok, we just gathering a symbolic name in SL record.
         */

-       if (isofs_rrip_getsymname(dirp,symname,&symlen,imp) == 0) {
+       if (cd9660_rrip_getsymname(dirp,symname,&symlen,imp) == 0) {

                FREE(symname,M_NAMEI);
                brelse(bp);
                return EINVAL;
                FREE(symname,M_NAMEI);
                brelse(bp);
                return EINVAL;


@@ -700,7 +700,7 @@ isofs_readlink(ap)
  * done. If a buffer has been saved in anticipation of a CREATE, delete it.
  */
 int
  * done. If a buffer has been saved in anticipation of a CREATE, delete it.
  */
 int

-isofs_abortop(ap)
+cd9660_abortop(ap)

        struct vop_abortop_args /* {
                struct vnode *a_dvp;
                struct componentname *a_cnp;
        struct vop_abortop_args /* {
                struct vnode *a_dvp;
                struct componentname *a_cnp;


@@ -715,7 +715,7 @@ isofs_abortop(ap)
  * Lock an inode.
  */
 int
  * Lock an inode.
  */
 int

-isofs_lock(ap)
+cd9660_lock(ap)

        struct vop_lock_args /* {
                struct vnode *a_vp;
        } */ *ap;
        struct vop_lock_args /* {
                struct vnode *a_vp;
        } */ *ap;


@@ -730,7 +730,7 @@ isofs_lock(ap)
  * Unlock an inode.
  */
 int
  * Unlock an inode.
  */
 int

-isofs_unlock(ap)
+cd9660_unlock(ap)

        struct vop_unlock_args /* {
                struct vnode *a_vp;
        } */ *ap;
        struct vop_unlock_args /* {
                struct vnode *a_vp;
        } */ *ap;


@@ -738,7 +738,7 @@ isofs_unlock(ap)
        register struct iso_node *ip = VTOI(ap->a_vp);
 
        if (!(ip->i_flag & ILOCKED))
        register struct iso_node *ip = VTOI(ap->a_vp);
 
        if (!(ip->i_flag & ILOCKED))

-               panic("isofs_unlock NOT LOCKED");
+               panic("cd9660_unlock NOT LOCKED");

        ISO_IUNLOCK(ip);
        return 0;
 }
        ISO_IUNLOCK(ip);
        return 0;
 }


@@ -747,7 +747,7 @@ isofs_unlock(ap)
  * Check for a locked inode.
  */
 int
  * Check for a locked inode.
  */
 int

-isofs_islocked(ap)
+cd9660_islocked(ap)

        struct vop_islocked_args /* {
                struct vnode *a_vp;
        } */ *ap;
        struct vop_islocked_args /* {
                struct vnode *a_vp;
        } */ *ap;


@@ -763,7 +763,7 @@ isofs_islocked(ap)
  * then call the device strategy routine.
  */
 int
  * then call the device strategy routine.
  */
 int

-isofs_strategy(ap)
+cd9660_strategy(ap)

        struct vop_strategy_args /* {
                struct buf *a_bp;
        } */ *ap;
        struct vop_strategy_args /* {
                struct buf *a_bp;
        } */ *ap;


@@ -775,7 +775,7 @@ isofs_strategy(ap)
 
        ip = VTOI(vp);
        if (vp->v_type == VBLK || vp->v_type == VCHR)
 
        ip = VTOI(vp);
        if (vp->v_type == VBLK || vp->v_type == VCHR)

-               panic("isofs_strategy: spec");
+               panic("cd9660_strategy: spec");

        if (bp->b_blkno == bp->b_lblkno) {
                if (error =
                    VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno, NULL)) {
        if (bp->b_blkno == bp->b_lblkno) {
                if (error =
                    VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno, NULL)) {


@@ -801,7 +801,7 @@ isofs_strategy(ap)
  * Print out the contents of an inode.
  */
 int
  * Print out the contents of an inode.
  */
 int

-isofs_print(ap)
+cd9660_print(ap)

        struct vop_print_args /* {
                struct vnode *a_vp;
        } */ *ap;
        struct vop_print_args /* {
                struct vnode *a_vp;
        } */ *ap;


@@ -814,7 +814,7 @@ isofs_print(ap)
  * Unsupported operation
  */
 int
  * Unsupported operation
  */
 int

-isofs_enotsupp()
+cd9660_enotsupp()

 {
 
        return (EOPNOTSUPP);
 {
 
        return (EOPNOTSUPP);


@@ -823,101 +823,106 @@ isofs_enotsupp()
 /*
  * Global vfs data structures for isofs
  */
 /*
  * Global vfs data structures for isofs
  */

-#define isofs_create ((int (*) __P((struct  vop_create_args *)))isofs_enotsupp)
-#define isofs_mknod ((int (*) __P((struct  vop_mknod_args *)))isofs_enotsupp)
-#define isofs_setattr \
-       ((int (*) __P((struct  vop_setattr_args *)))isofs_enotsupp)
-#define isofs_write ((int (*) __P((struct  vop_write_args *)))isofs_enotsupp)
-#define isofs_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
-#define isofs_remove ((int (*) __P((struct  vop_remove_args *)))isofs_enotsupp)
-#define isofs_link ((int (*) __P((struct  vop_link_args *)))isofs_enotsupp)
-#define isofs_rename ((int (*) __P((struct  vop_rename_args *)))isofs_enotsupp)
-#define isofs_mkdir ((int (*) __P((struct  vop_mkdir_args *)))isofs_enotsupp)
-#define isofs_rmdir ((int (*) __P((struct  vop_rmdir_args *)))isofs_enotsupp)
-#define isofs_symlink \
-       ((int (*) __P((struct vop_symlink_args *)))isofs_enotsupp)
-#define isofs_pathconf \
-       ((int (*) __P((struct vop_pathconf_args *)))isofs_enotsupp)
-#define isofs_advlock \
-       ((int (*) __P((struct vop_advlock_args *)))isofs_enotsupp)
-#define isofs_blkatoff \
-       ((int (*) __P((struct  vop_blkatoff_args *)))isofs_enotsupp)
-#define isofs_valloc ((int(*) __P(( \
+#define cd9660_create \
+       ((int (*) __P((struct  vop_create_args *)))cd9660_enotsupp)
+#define cd9660_mknod ((int (*) __P((struct  vop_mknod_args *)))cd9660_enotsupp)
+#define cd9660_setattr \
+       ((int (*) __P((struct  vop_setattr_args *)))cd9660_enotsupp)
+#define cd9660_write ((int (*) __P((struct  vop_write_args *)))cd9660_enotsupp)
+#define cd9660_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
+#define cd9660_remove \
+       ((int (*) __P((struct  vop_remove_args *)))cd9660_enotsupp)
+#define cd9660_link ((int (*) __P((struct  vop_link_args *)))cd9660_enotsupp)
+#define cd9660_rename \
+       ((int (*) __P((struct  vop_rename_args *)))cd9660_enotsupp)
+#define cd9660_mkdir ((int (*) __P((struct  vop_mkdir_args *)))cd9660_enotsupp)
+#define cd9660_rmdir ((int (*) __P((struct  vop_rmdir_args *)))cd9660_enotsupp)
+#define cd9660_symlink \
+       ((int (*) __P((struct vop_symlink_args *)))cd9660_enotsupp)
+#define cd9660_pathconf \
+       ((int (*) __P((struct vop_pathconf_args *)))cd9660_enotsupp)
+#define cd9660_advlock \
+       ((int (*) __P((struct vop_advlock_args *)))cd9660_enotsupp)
+#define cd9660_blkatoff \
+       ((int (*) __P((struct  vop_blkatoff_args *)))cd9660_enotsupp)
+#define cd9660_valloc ((int(*) __P(( \

                struct vnode *pvp, \
                int mode, \
                struct ucred *cred, \
                struct vnode *pvp, \
                int mode, \
                struct ucred *cred, \

-               struct vnode **vpp))) isofs_enotsupp)
-#define isofs_vfree ((int (*) __P((struct  vop_vfree_args *)))isofs_enotsupp)
-#define isofs_truncate \
-       ((int (*) __P((struct  vop_truncate_args *)))isofs_enotsupp)
-#define isofs_update ((int (*) __P((struct  vop_update_args *)))isofs_enotsupp)
-#define isofs_bwrite ((int (*) __P((struct  vop_bwrite_args *)))isofs_enotsupp)
+               struct vnode **vpp))) cd9660_enotsupp)
+#define cd9660_vfree ((int (*) __P((struct  vop_vfree_args *)))cd9660_enotsupp)
+#define cd9660_truncate \
+       ((int (*) __P((struct  vop_truncate_args *)))cd9660_enotsupp)
+#define cd9660_update \
+       ((int (*) __P((struct  vop_update_args *)))cd9660_enotsupp)
+#define cd9660_bwrite \
+       ((int (*) __P((struct  vop_bwrite_args *)))cd9660_enotsupp)

 
 /*
  * Global vfs data structures for nfs
  */
 
 /*
  * Global vfs data structures for nfs
  */

-int (**isofs_vnodeop_p)();
-struct vnodeopv_entry_desc isofs_vnodeop_entries[] = {
+int (**cd9660_vnodeop_p)();
+struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {

        { &vop_default_desc, vn_default_error },
        { &vop_default_desc, vn_default_error },

-       { &vop_lookup_desc, isofs_lookup },     /* lookup */
-       { &vop_create_desc, isofs_create },     /* create */
-       { &vop_mknod_desc, isofs_mknod },       /* mknod */
-       { &vop_open_desc, isofs_open },         /* open */
-       { &vop_close_desc, isofs_close },       /* close */
-       { &vop_access_desc, isofs_access },     /* access */
-       { &vop_getattr_desc, isofs_getattr },   /* getattr */
-       { &vop_setattr_desc, isofs_setattr },   /* setattr */
-       { &vop_read_desc, isofs_read },         /* read */
-       { &vop_write_desc, isofs_write },       /* write */
-       { &vop_ioctl_desc, isofs_ioctl },       /* ioctl */
-       { &vop_select_desc, isofs_select },     /* select */
-       { &vop_mmap_desc, isofs_mmap },         /* mmap */
-       { &vop_fsync_desc, isofs_fsync },       /* fsync */
-       { &vop_seek_desc, isofs_seek },         /* seek */
-       { &vop_remove_desc, isofs_remove },     /* remove */
-       { &vop_link_desc, isofs_link },         /* link */
-       { &vop_rename_desc, isofs_rename },     /* rename */
-       { &vop_mkdir_desc, isofs_mkdir },       /* mkdir */
-       { &vop_rmdir_desc, isofs_rmdir },       /* rmdir */
-       { &vop_symlink_desc, isofs_symlink },   /* symlink */
-       { &vop_readdir_desc, isofs_readdir },   /* readdir */
-       { &vop_readlink_desc, isofs_readlink }, /* readlink */
-       { &vop_abortop_desc, isofs_abortop },   /* abortop */
-       { &vop_inactive_desc, isofs_inactive }, /* inactive */
-       { &vop_reclaim_desc, isofs_reclaim },   /* reclaim */
-       { &vop_lock_desc, isofs_lock },         /* lock */
-       { &vop_unlock_desc, isofs_unlock },     /* unlock */
-       { &vop_bmap_desc, isofs_bmap },         /* bmap */
-       { &vop_strategy_desc, isofs_strategy }, /* strategy */
-       { &vop_print_desc, isofs_print },       /* print */
-       { &vop_islocked_desc, isofs_islocked }, /* islocked */
-       { &vop_pathconf_desc, isofs_pathconf }, /* pathconf */
-       { &vop_advlock_desc, isofs_advlock },   /* advlock */
-       { &vop_blkatoff_desc, isofs_blkatoff }, /* blkatoff */
-       { &vop_valloc_desc, isofs_valloc },     /* valloc */
-       { &vop_vfree_desc, isofs_vfree },       /* vfree */
-       { &vop_truncate_desc, isofs_truncate }, /* truncate */
-       { &vop_update_desc, isofs_update },     /* update */
+       { &vop_lookup_desc, cd9660_lookup },    /* lookup */
+       { &vop_create_desc, cd9660_create },    /* create */
+       { &vop_mknod_desc, cd9660_mknod },      /* mknod */
+       { &vop_open_desc, cd9660_open },        /* open */
+       { &vop_close_desc, cd9660_close },      /* close */
+       { &vop_access_desc, cd9660_access },    /* access */
+       { &vop_getattr_desc, cd9660_getattr },  /* getattr */
+       { &vop_setattr_desc, cd9660_setattr },  /* setattr */
+       { &vop_read_desc, cd9660_read },        /* read */
+       { &vop_write_desc, cd9660_write },      /* write */
+       { &vop_ioctl_desc, cd9660_ioctl },      /* ioctl */
+       { &vop_select_desc, cd9660_select },    /* select */
+       { &vop_mmap_desc, cd9660_mmap },        /* mmap */
+       { &vop_fsync_desc, cd9660_fsync },      /* fsync */
+       { &vop_seek_desc, cd9660_seek },        /* seek */
+       { &vop_remove_desc, cd9660_remove },    /* remove */
+       { &vop_link_desc, cd9660_link },        /* link */
+       { &vop_rename_desc, cd9660_rename },    /* rename */
+       { &vop_mkdir_desc, cd9660_mkdir },      /* mkdir */
+       { &vop_rmdir_desc, cd9660_rmdir },      /* rmdir */
+       { &vop_symlink_desc, cd9660_symlink },  /* symlink */
+       { &vop_readdir_desc, cd9660_readdir },  /* readdir */
+       { &vop_readlink_desc, cd9660_readlink },/* readlink */
+       { &vop_abortop_desc, cd9660_abortop },  /* abortop */
+       { &vop_inactive_desc, cd9660_inactive },/* inactive */
+       { &vop_reclaim_desc, cd9660_reclaim },  /* reclaim */
+       { &vop_lock_desc, cd9660_lock },        /* lock */
+       { &vop_unlock_desc, cd9660_unlock },    /* unlock */
+       { &vop_bmap_desc, cd9660_bmap },        /* bmap */
+       { &vop_strategy_desc, cd9660_strategy },/* strategy */
+       { &vop_print_desc, cd9660_print },      /* print */
+       { &vop_islocked_desc, cd9660_islocked },/* islocked */
+       { &vop_pathconf_desc, cd9660_pathconf },/* pathconf */
+       { &vop_advlock_desc, cd9660_advlock },  /* advlock */
+       { &vop_blkatoff_desc, cd9660_blkatoff },/* blkatoff */
+       { &vop_valloc_desc, cd9660_valloc },    /* valloc */
+       { &vop_vfree_desc, cd9660_vfree },      /* vfree */
+       { &vop_truncate_desc, cd9660_truncate },/* truncate */
+       { &vop_update_desc, cd9660_update },    /* update */

        { &vop_bwrite_desc, vn_bwrite },
        { (struct vnodeop_desc*)NULL, (int(*)())NULL }
 };
        { &vop_bwrite_desc, vn_bwrite },
        { (struct vnodeop_desc*)NULL, (int(*)())NULL }
 };

-struct vnodeopv_desc isofs_vnodeop_opv_desc =
-       { &isofs_vnodeop_p, isofs_vnodeop_entries };
+struct vnodeopv_desc cd9660_vnodeop_opv_desc =
+       { &cd9660_vnodeop_p, cd9660_vnodeop_entries };

 
 /*
  * Special device vnode ops
  */
 
 /*
  * Special device vnode ops
  */

-int (**isofs_specop_p)();
-struct vnodeopv_entry_desc isofs_specop_entries[] = {
+int (**cd9660_specop_p)();
+struct vnodeopv_entry_desc cd9660_specop_entries[] = {

        { &vop_default_desc, vn_default_error },
        { &vop_lookup_desc, spec_lookup },      /* lookup */
        { &vop_default_desc, vn_default_error },
        { &vop_lookup_desc, spec_lookup },      /* lookup */

-       { &vop_create_desc, isofs_create },     /* create */
-       { &vop_mknod_desc, isofs_mknod },       /* mknod */
+       { &vop_create_desc, cd9660_create },    /* create */
+       { &vop_mknod_desc, cd9660_mknod },      /* mknod */

        { &vop_open_desc, spec_open },          /* open */
        { &vop_close_desc, spec_close },        /* close */
        { &vop_open_desc, spec_open },          /* open */
        { &vop_close_desc, spec_close },        /* close */

-       { &vop_access_desc, isofs_access },     /* access */
-       { &vop_getattr_desc, isofs_getattr },   /* getattr */
-       { &vop_setattr_desc, isofs_setattr },   /* setattr */
+       { &vop_access_desc, cd9660_access },    /* access */
+       { &vop_getattr_desc, cd9660_getattr },  /* getattr */
+       { &vop_setattr_desc, cd9660_setattr },  /* setattr */

        { &vop_read_desc, spec_read },          /* read */
        { &vop_write_desc, spec_write },        /* write */
        { &vop_ioctl_desc, spec_ioctl },        /* ioctl */
        { &vop_read_desc, spec_read },          /* read */
        { &vop_write_desc, spec_write },        /* write */
        { &vop_ioctl_desc, spec_ioctl },        /* ioctl */


@@ -925,49 +930,49 @@ struct vnodeopv_entry_desc isofs_specop_entries[] = {
        { &vop_mmap_desc, spec_mmap },          /* mmap */
        { &vop_fsync_desc, spec_fsync },        /* fsync */
        { &vop_seek_desc, spec_seek },          /* seek */
        { &vop_mmap_desc, spec_mmap },          /* mmap */
        { &vop_fsync_desc, spec_fsync },        /* fsync */
        { &vop_seek_desc, spec_seek },          /* seek */

-       { &vop_remove_desc, isofs_remove },     /* remove */
-       { &vop_link_desc, isofs_link },         /* link */
-       { &vop_rename_desc, isofs_rename },     /* rename */
-       { &vop_mkdir_desc, isofs_mkdir },       /* mkdir */
-       { &vop_rmdir_desc, isofs_rmdir },       /* rmdir */
-       { &vop_symlink_desc, isofs_symlink },   /* symlink */
+       { &vop_remove_desc, cd9660_remove },    /* remove */
+       { &vop_link_desc, cd9660_link },        /* link */
+       { &vop_rename_desc, cd9660_rename },    /* rename */
+       { &vop_mkdir_desc, cd9660_mkdir },      /* mkdir */
+       { &vop_rmdir_desc, cd9660_rmdir },      /* rmdir */
+       { &vop_symlink_desc, cd9660_symlink },  /* symlink */

        { &vop_readdir_desc, spec_readdir },    /* readdir */
        { &vop_readlink_desc, spec_readlink },  /* readlink */
        { &vop_abortop_desc, spec_abortop },    /* abortop */
        { &vop_readdir_desc, spec_readdir },    /* readdir */
        { &vop_readlink_desc, spec_readlink },  /* readlink */
        { &vop_abortop_desc, spec_abortop },    /* abortop */

-       { &vop_inactive_desc, isofs_inactive }, /* inactive */
-       { &vop_reclaim_desc, isofs_reclaim },   /* reclaim */
-       { &vop_lock_desc, isofs_lock },         /* lock */
-       { &vop_unlock_desc, isofs_unlock },     /* unlock */
+       { &vop_inactive_desc, cd9660_inactive },/* inactive */
+       { &vop_reclaim_desc, cd9660_reclaim },  /* reclaim */
+       { &vop_lock_desc, cd9660_lock },        /* lock */
+       { &vop_unlock_desc, cd9660_unlock },    /* unlock */

        { &vop_bmap_desc, spec_bmap },          /* bmap */
                /* XXX strategy: panics, should be notsupp instead? */
        { &vop_bmap_desc, spec_bmap },          /* bmap */
                /* XXX strategy: panics, should be notsupp instead? */

-       { &vop_strategy_desc, isofs_strategy }, /* strategy */
-       { &vop_print_desc, isofs_print },       /* print */
-       { &vop_islocked_desc, isofs_islocked }, /* islocked */
+       { &vop_strategy_desc, cd9660_strategy },/* strategy */
+       { &vop_print_desc, cd9660_print },      /* print */
+       { &vop_islocked_desc, cd9660_islocked },/* islocked */

        { &vop_pathconf_desc, spec_pathconf },  /* pathconf */
        { &vop_advlock_desc, spec_advlock },    /* advlock */
        { &vop_blkatoff_desc, spec_blkatoff },  /* blkatoff */
        { &vop_valloc_desc, spec_valloc },      /* valloc */
        { &vop_vfree_desc, spec_vfree },        /* vfree */
        { &vop_truncate_desc, spec_truncate },  /* truncate */
        { &vop_pathconf_desc, spec_pathconf },  /* pathconf */
        { &vop_advlock_desc, spec_advlock },    /* advlock */
        { &vop_blkatoff_desc, spec_blkatoff },  /* blkatoff */
        { &vop_valloc_desc, spec_valloc },      /* valloc */
        { &vop_vfree_desc, spec_vfree },        /* vfree */
        { &vop_truncate_desc, spec_truncate },  /* truncate */

-       { &vop_update_desc, isofs_update },     /* update */
+       { &vop_update_desc, cd9660_update },    /* update */

        { &vop_bwrite_desc, vn_bwrite },
        { (struct vnodeop_desc*)NULL, (int(*)())NULL }
 };
        { &vop_bwrite_desc, vn_bwrite },
        { (struct vnodeop_desc*)NULL, (int(*)())NULL }
 };

-struct vnodeopv_desc isofs_specop_opv_desc =
-       { &isofs_specop_p, isofs_specop_entries };
+struct vnodeopv_desc cd9660_specop_opv_desc =
+       { &cd9660_specop_p, cd9660_specop_entries };

 
 #ifdef FIFO
 
 #ifdef FIFO

-int (**isofs_fifoop_p)();
-struct vnodeopv_entry_desc isofs_fifoop_entries[] = {
+int (**cd9660_fifoop_p)();
+struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {

        { &vop_default_desc, vn_default_error },
        { &vop_lookup_desc, fifo_lookup },      /* lookup */
        { &vop_default_desc, vn_default_error },
        { &vop_lookup_desc, fifo_lookup },      /* lookup */

-       { &vop_create_desc, isofs_create },     /* create */
-       { &vop_mknod_desc, isofs_mknod },       /* mknod */
+       { &vop_create_desc, cd9660_create },    /* create */
+       { &vop_mknod_desc, cd9660_mknod },      /* mknod */

        { &vop_open_desc, fifo_open },          /* open */
        { &vop_close_desc, fifo_close },        /* close */
        { &vop_open_desc, fifo_open },          /* open */
        { &vop_close_desc, fifo_close },        /* close */

-       { &vop_access_desc, isofs_access },     /* access */
-       { &vop_getattr_desc, isofs_getattr },   /* getattr */
-       { &vop_setattr_desc, isofs_setattr },   /* setattr */
+       { &vop_access_desc, cd9660_access },    /* access */
+       { &vop_getattr_desc, cd9660_getattr },  /* getattr */
+       { &vop_setattr_desc, cd9660_setattr },  /* setattr */

        { &vop_read_desc, fifo_read },          /* read */
        { &vop_write_desc, fifo_write },        /* write */
        { &vop_ioctl_desc, fifo_ioctl },        /* ioctl */
        { &vop_read_desc, fifo_read },          /* read */
        { &vop_write_desc, fifo_write },        /* write */
        { &vop_ioctl_desc, fifo_ioctl },        /* ioctl */


@@ -975,33 +980,33 @@ struct vnodeopv_entry_desc isofs_fifoop_entries[] = {
        { &vop_mmap_desc, fifo_mmap },          /* mmap */
        { &vop_fsync_desc, fifo_fsync },        /* fsync */
        { &vop_seek_desc, fifo_seek },          /* seek */
        { &vop_mmap_desc, fifo_mmap },          /* mmap */
        { &vop_fsync_desc, fifo_fsync },        /* fsync */
        { &vop_seek_desc, fifo_seek },          /* seek */

-       { &vop_remove_desc, isofs_remove },     /* remove */
-       { &vop_link_desc, isofs_link },         /* link */
-       { &vop_rename_desc, isofs_rename },     /* rename */
-       { &vop_mkdir_desc, isofs_mkdir },       /* mkdir */
-       { &vop_rmdir_desc, isofs_rmdir },       /* rmdir */
-       { &vop_symlink_desc, isofs_symlink },   /* symlink */
+       { &vop_remove_desc, cd9660_remove },    /* remove */
+       { &vop_link_desc, cd9660_link },        /* link */
+       { &vop_rename_desc, cd9660_rename },    /* rename */
+       { &vop_mkdir_desc, cd9660_mkdir },      /* mkdir */
+       { &vop_rmdir_desc, cd9660_rmdir },      /* rmdir */
+       { &vop_symlink_desc, cd9660_symlink },  /* symlink */

        { &vop_readdir_desc, fifo_readdir },    /* readdir */
        { &vop_readlink_desc, fifo_readlink },  /* readlink */
        { &vop_abortop_desc, fifo_abortop },    /* abortop */
        { &vop_readdir_desc, fifo_readdir },    /* readdir */
        { &vop_readlink_desc, fifo_readlink },  /* readlink */
        { &vop_abortop_desc, fifo_abortop },    /* abortop */

-       { &vop_inactive_desc, isofs_inactive }, /* inactive */
-       { &vop_reclaim_desc, isofs_reclaim },   /* reclaim */
-       { &vop_lock_desc, isofs_lock },         /* lock */
-       { &vop_unlock_desc, isofs_unlock },     /* unlock */
+       { &vop_inactive_desc, cd9660_inactive },/* inactive */
+       { &vop_reclaim_desc, cd9660_reclaim },  /* reclaim */
+       { &vop_lock_desc, cd9660_lock },        /* lock */
+       { &vop_unlock_desc, cd9660_unlock },    /* unlock */

        { &vop_bmap_desc, fifo_bmap },          /* bmap */
        { &vop_strategy_desc, fifo_badop },     /* strategy */
        { &vop_bmap_desc, fifo_bmap },          /* bmap */
        { &vop_strategy_desc, fifo_badop },     /* strategy */

-       { &vop_print_desc, isofs_print },       /* print */
-       { &vop_islocked_desc, isofs_islocked }, /* islocked */
+       { &vop_print_desc, cd9660_print },      /* print */
+       { &vop_islocked_desc, cd9660_islocked },/* islocked */

        { &vop_pathconf_desc, fifo_pathconf },  /* pathconf */
        { &vop_advlock_desc, fifo_advlock },    /* advlock */
        { &vop_blkatoff_desc, fifo_blkatoff },  /* blkatoff */
        { &vop_valloc_desc, fifo_valloc },      /* valloc */
        { &vop_vfree_desc, fifo_vfree },        /* vfree */
        { &vop_truncate_desc, fifo_truncate },  /* truncate */
        { &vop_pathconf_desc, fifo_pathconf },  /* pathconf */
        { &vop_advlock_desc, fifo_advlock },    /* advlock */
        { &vop_blkatoff_desc, fifo_blkatoff },  /* blkatoff */
        { &vop_valloc_desc, fifo_valloc },      /* valloc */
        { &vop_vfree_desc, fifo_vfree },        /* vfree */
        { &vop_truncate_desc, fifo_truncate },  /* truncate */

-       { &vop_update_desc, isofs_update },     /* update */
+       { &vop_update_desc, cd9660_update },    /* update */

        { &vop_bwrite_desc, vn_bwrite },
        { (struct vnodeop_desc*)NULL, (int(*)())NULL }
 };
        { &vop_bwrite_desc, vn_bwrite },
        { (struct vnodeop_desc*)NULL, (int(*)())NULL }
 };

-struct vnodeopv_desc isofs_fifoop_opv_desc =
-       { &isofs_fifoop_p, isofs_fifoop_entries };
+struct vnodeopv_desc cd9660_fifoop_opv_desc =
+       { &cd9660_fifoop_p, cd9660_fifoop_entries };

 #endif /* FIFO */
 #endif /* FIFO */

diff --git a/usr/src/sys/isofs/cd9660/iso.h b/usr/src/sys/isofs/cd9660/iso.h
index dc5c3af..cf8b29e 100644 (file)
--- a/usr/src/sys/isofs/cd9660/iso.h
+++ b/usr/src/sys/isofs/cd9660/iso.h
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)iso.h       8.1 (Berkeley) %G%
+ *     @(#)iso.h       8.2 (Berkeley) %G%

  */
 
 #define ISODCL(from, to) (to - from + 1)
  */
 
 #define ISODCL(from, to) (to - from + 1)


@@ -139,19 +139,19 @@ struct iso_mnt {
 #define iso_blksize(imp, ip, lbn) ((imp)->logical_block_size)
 #define iso_lblktosize(imp, blk) ((blk) << (imp)->im_bshift)
 
 #define iso_blksize(imp, ip, lbn) ((imp)->logical_block_size)
 #define iso_lblktosize(imp, blk) ((blk) << (imp)->im_bshift)
 

-int isofs_mount __P((struct mount *,
+int cd9660_mount __P((struct mount *,

            char *, caddr_t, struct nameidata *, struct proc *));
            char *, caddr_t, struct nameidata *, struct proc *));

-int isofs_start __P((struct mount *, int, struct proc *));
-int isofs_unmount __P((struct mount *, int, struct proc *));
-int isofs_root __P((struct mount *, struct vnode **));
-int isofs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
-int isofs_statfs __P((struct mount *, struct statfs *, struct proc *));
-int isofs_sync __P((struct mount *, int, struct ucred *, struct proc *));
-int isofs_vget __P((struct mount *, ino_t, struct vnode **));
-int isofs_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
+int cd9660_start __P((struct mount *, int, struct proc *));
+int cd9660_unmount __P((struct mount *, int, struct proc *));
+int cd9660_root __P((struct mount *, struct vnode **));
+int cd9660_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
+int cd9660_statfs __P((struct mount *, struct statfs *, struct proc *));
+int cd9660_sync __P((struct mount *, int, struct ucred *, struct proc *));
+int cd9660_vget __P((struct mount *, ino_t, struct vnode **));
+int cd9660_fhtovp __P((struct mount *, struct fid *, struct mbuf *,

            struct vnode **, int *, struct ucred **));
            struct vnode **, int *, struct ucred **));

-int isofs_vptofh __P((struct vnode *, struct fid *));
-int isofs_init __P(());
+int cd9660_vptofh __P((struct vnode *, struct fid *));
+int cd9660_init __P(());

 
 struct iso_node;
 int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp)); 
 
 struct iso_node;
 int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp)); 


@@ -160,9 +160,9 @@ int iso_iget __P((struct iso_node *xp, ino_t ino, int relocated,
 int iso_iput __P((struct iso_node *ip)); 
 int iso_ilock __P((struct iso_node *ip)); 
 int iso_iunlock __P((struct iso_node *ip)); 
 int iso_iput __P((struct iso_node *ip)); 
 int iso_ilock __P((struct iso_node *ip)); 
 int iso_iunlock __P((struct iso_node *ip)); 

-int isofs_mountroot __P((void)); 
+int cd9660_mountroot __P((void)); 

 
 

-extern int (**isofs_vnodeop_p)();
+extern int (**cd9660_vnodeop_p)();

 
 extern inline int
 isonum_711(p)
 
 extern inline int
 isonum_711(p)

diff --git a/usr/src/sys/isofs/cd9660/iso_rrip.h b/usr/src/sys/isofs/cd9660/iso_rrip.h
index ee639d0..72ab4ed 100644 (file)
--- a/usr/src/sys/isofs/cd9660/iso_rrip.h
+++ b/usr/src/sys/isofs/cd9660/iso_rrip.h
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)iso_rrip.h  8.1 (Berkeley) %G%
+ *     @(#)iso_rrip.h  8.2 (Berkeley) %G%

  */
 
 
  */
 
 


@@ -45,13 +45,13 @@ typedef struct {
        int             cont;           /* continuation of above */
 } ISO_RRIP_ANALYZE;
 
        int             cont;           /* continuation of above */
 } ISO_RRIP_ANALYZE;
 

-int isofs_rrip_analyze __P((struct iso_directory_record *isodir,
+int cd9660_rrip_analyze __P((struct iso_directory_record *isodir,

                            struct iso_node *inop, struct iso_mnt *imp));
                            struct iso_node *inop, struct iso_mnt *imp));

-int isofs_rrip_getname __P((struct iso_directory_record *isodir,
+int cd9660_rrip_getname __P((struct iso_directory_record *isodir,

                            char *outbuf, u_short *outlen,
                            ino_t *inump, struct iso_mnt *imp));
                            char *outbuf, u_short *outlen,
                            ino_t *inump, struct iso_mnt *imp));

-int isofs_rrip_getsymname __P((struct iso_directory_record *isodir,
+int cd9660_rrip_getsymname __P((struct iso_directory_record *isodir,

                               char *outbuf, u_short *outlen,
                               struct iso_mnt *imp));
                               char *outbuf, u_short *outlen,
                               struct iso_mnt *imp));

-int isofs_rrip_offset __P((struct iso_directory_record *isodir,
+int cd9660_rrip_offset __P((struct iso_directory_record *isodir,

                           struct iso_mnt *imp));
                           struct iso_mnt *imp));