4 files changed, 9 insertions, 9 deletions

diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 9640d6eed872c..ea22187acb743 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.26 1999/01/02 11:34:54 bde Exp $
+ * $Id: cd9660_node.c,v 1.27 1999/01/27 21:49:54 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -57,7 +57,7 @@
  */
 static struct iso_node **isohashtbl;
 static u_long isohash;
-#define	INOHASH(device, inum)	(((device) + ((inum)>>12)) & isohash)
+#define	INOHASH(device, inum)	((minor(device) + ((inum)>>12)) & isohash)
 #ifndef NULL_SIMPLELOCKS
 static struct simplelock cd9660_ihash_slock;
 #endif
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 33b208f7cbb54..46e54466fb9aa 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $Id: cd9660_node.h,v 1.16 1997/11/18 14:40:34 phk Exp $
+ * $Id: cd9660_node.h,v 1.17 1998/02/03 21:39:30 bde Exp $
  */
 
 /*
@@ -56,7 +56,7 @@ typedef	struct	{
 	uid_t		iso_uid;	/* owner user id */
 	gid_t		iso_gid;	/* owner group id */
 	short		iso_links;	/* links of file */
-	dev_t		iso_rdev;	/* Major/Minor number for special */
+	udev_t		iso_rdev;	/* Major/Minor number for special */
 } ISO_RRIP_INODE;
 
 
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index 27a57ec978c58..941435c695234 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.6 (Berkeley) 12/5/94
- * $Id: cd9660_rrip.c,v 1.13 1997/08/02 14:31:19 bde Exp $
+ * $Id: cd9660_rrip.c,v 1.14 1999/04/18 10:58:01 dcs Exp $
  */
 
 #include <sys/param.h>
@@ -423,9 +423,9 @@ cd9660_rrip_device(p,ana)
 	low  = isonum_733(p->dev_t_low);
 	
 	if (high == 0)
-		ana->inop->inode.iso_rdev = makedev(major(low), minor(low));
+		ana->inop->inode.iso_rdev = umakedev(umajor(low), uminor(low));
 	else
-		ana->inop->inode.iso_rdev = makedev(high, minor(low));
+		ana->inop->inode.iso_rdev = umakedev(high, uminor(low));
 	ana->fields &= ~ISO_SUSP_DEVICE;
 	return ISO_SUSP_DEVICE;
 }
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index b5f9e9693098a..0b07d14dadd49 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.54 1999/01/27 21:49:55 dillon Exp $
+ * $Id: cd9660_vnops.c,v 1.55 1999/04/18 10:58:02 dcs Exp $
  */
 
 #include <sys/param.h>
@@ -210,7 +210,7 @@ cd9660_getattr(ap)
 	register struct vattr *vap = ap->a_vap;
 	register struct iso_node *ip = VTOI(vp);
 
-	vap->va_fsid	= ip->i_dev;
+	vap->va_fsid	= dev2udev(ip->i_dev);
 	vap->va_fileid	= ip->i_number;
 
 	vap->va_mode	= ip->inode.iso_mode;