Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/fs/cd9660/cd9660_node.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/fs/cd9660/cd9660_node.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.12
retrieving revision 1.12.46.1
diff -u -p -r1.12 -r1.12.46.1
--- src/sys/fs/cd9660/cd9660_node.h	2005/12/03 22:16:16	1.12
+++ src/sys/fs/cd9660/cd9660_node.h	2008/01/09 01:55:40	1.12.46.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_node.h,v 1.12 2005/12/03 22:16:16 christos Exp $	*/
+/*	$NetBSD: cd9660_node.h,v 1.12.46.1 2008/01/09 01:55:40 matt Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -61,18 +61,6 @@ typedef	struct	{
 	dev_t		iso_rdev;	/* Major/Minor number for special */
 } ISO_RRIP_INODE;
 
-#ifdef ISODEVMAP
-/*
- * FOr device# (major,minor) translation table
- */
-struct iso_dnode {
-	LIST_ENTRY(iso_dnode) d_hash;
-	dev_t		i_dev;		/* device where dnode resides */
-	ino_t		i_number;	/* the identity of the inode */
-	dev_t		d_dev;		/* device # for translation */
-};
-#endif
-
 struct iso_node {
 	struct	genfs_node i_gnode;
 	LIST_ENTRY(iso_node) i_hash;
@@ -140,16 +128,15 @@ void	cd9660_defattr(struct iso_directory
 			struct iso_node *, struct buf *);
 void	cd9660_deftstamp(struct iso_directory_record *,
 			struct iso_node *, struct buf *);
-struct	vnode *cd9660_ihashget(dev_t, ino_t);
+struct	vnode *cd9660_ihashget(dev_t, ino_t, int);
 void	cd9660_ihashins(struct iso_node *);
 void	cd9660_ihashrem(struct iso_node *);
 int	cd9660_tstamp_conv7(u_char *, struct timespec *);
 int	cd9660_tstamp_conv17(u_char *, struct timespec *);
 int	cd9660_vget_internal(struct mount *, ino_t, struct vnode **, int,
 			      struct iso_directory_record *);
-#ifdef	ISODEVMAP
-struct iso_dnode *iso_dmap(dev_t, ino_t, int);
-void iso_dunmap(dev_t);
-#endif
+
+extern kmutex_t cd9660_hashlock;
+
 #endif /* _KERNEL */
 #endif /* _ISOFS_CD9660_CD9660_NODE_H_ */