1 files changed, 15 insertions, 21 deletions

diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 992f9cb..de538fb 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)cd9660_node.h	8.2 (Berkeley) 1/23/94
+ *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
  * $FreeBSD$
  */
 
@@ -59,22 +59,20 @@ typedef	struct	{
 	dev_t		iso_rdev;	/* Major/Minor number for special */
 } ISO_RRIP_INODE;
 
-#ifdef	ISODEVMAP
+#ifdef ISODEVMAP
 /*
  * FOr device# (major,minor) translation table
  */
 struct iso_dnode {
-	struct iso_dnode *d_chain[2];	/* hash chain, MUST be first */
+	struct iso_dnode *d_next, **d_prev;	/* hash chain */
 	dev_t		i_dev;		/* device where dnode resides */
 	ino_t		i_number;	/* the identity of the inode */
 	dev_t		d_dev;		/* device # for translation */
 };
-#define	d_forw		d_chain[0]
-#define	d_back		d_chain[1]
 #endif
 
 struct iso_node {
-	struct	iso_node *i_chain[2]; /* hash chain, MUST be first */
+	struct	iso_node *i_next, **i_prev;	/* hash chain */
 	struct	vnode *i_vnode;	/* vnode associated with this inode */
 	struct	vnode *i_devvp;	/* vnode for block I/O */
 	u_long	i_flag;		/* see below */
@@ -87,8 +85,7 @@ struct iso_node {
 	doff_t	i_diroff;	/* offset in dir, where we found last entry */
 	doff_t	i_offset;	/* offset of free space in directory */
 	ino_t	i_ino;		/* inode number of found directory */
-	long	i_spare0;
-	long	i_spare1;
+	struct	lock i_lock;	/* node lock */
 
 	long iso_extent;	/* extent of file */
 	long i_size;
@@ -101,19 +98,11 @@ struct iso_node {
 #define	i_back		i_chain[1]
 
 /* flags */
-#define	ILOCKED		0x0001		/* inode is locked */
-#define	IWANT		0x0002		/* some process waiting on lock */
-#define	IACC		0x0020		/* inode access time to be updated */
+#define	IN_ACCESS	0x0020		/* inode access time to be updated */
 
 #define VTOI(vp) ((struct iso_node *)(vp)->v_data)
 #define ITOV(ip) ((ip)->i_vnode)
 
-#define ISO_ILOCK(ip)	iso_ilock(ip)
-#define ISO_IUNLOCK(ip)	iso_iunlock(ip)
-
-extern vop_t	**cd9660_fifoop_p;
-extern vop_t	**cd9660_specop_p;
-
 /*
  * Prototypes for ISOFS vnode operations
  */
@@ -121,14 +110,19 @@ int cd9660_lookup __P((struct vop_lookup_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_pathconf __P((struct vop_pathconf_args *));
+int cd9660_blkatoff __P((struct vop_blkatoff_args *));
+#define cd9660_revoke vop_revoke
+
 void cd9660_defattr __P((struct iso_directory_record *,
 			struct iso_node *, struct buf *, enum ISO_FTYPE));
 void cd9660_deftstamp __P((struct iso_directory_record *,
 			struct iso_node *, struct buf *, enum ISO_FTYPE));
-int cd9660_tstamp_conv7 __P((char *pi, struct timespec *pu, enum ISO_FTYPE));
-int cd9660_tstamp_conv17 __P((unsigned char *pi, struct timespec *pu));
-void isodirino __P((ino_t *inump, struct iso_directory_record *isodir,
-		    struct iso_mnt *imp));
+struct vnode *cd9660_ihashget __P((dev_t, ino_t));
+void cd9660_ihashins __P((struct iso_node *));
+void cd9660_ihashrem __P((struct iso_node *));
+int cd9660_tstamp_conv7 __P((u_char *, struct timespec *, enum ISO_FTYPE));
+int cd9660_tstamp_conv17 __P((u_char *, struct timespec *));
 #ifdef	ISODEVMAP
 struct iso_dnode *iso_dmap __P((dev_t, ino_t, int));
 void iso_dunmap __P((dev_t));