Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

4 files changed, 7 insertions, 7 deletions

diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index b51f15d..687ec66 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -92,7 +92,7 @@ cd9660_uninit(vfsp)
  */
 int
 cd9660_ihashget(dev, inum, flags, vpp)
-	dev_t dev;
+	struct cdev *dev;
 	ino_t inum;
 	int flags;
 	struct vnode **vpp;
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 8e7d6c1..a5b228c 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -113,7 +113,7 @@ void cd9660_defattr(struct iso_directory_record *,
 			struct iso_node *, struct buf *, enum ISO_FTYPE);
 void cd9660_deftstamp(struct iso_directory_record *,
 			struct iso_node *, struct buf *, enum ISO_FTYPE);
-int cd9660_ihashget(dev_t, ino_t, int, struct vnode **);
+int cd9660_ihashget(struct cdev *, ino_t, int, struct vnode **);
 void cd9660_ihashins(struct iso_node *);
 int cd9660_tstamp_conv7(u_char *, struct timespec *, enum ISO_FTYPE);
 int cd9660_tstamp_conv17(u_char *, struct timespec *);
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index ceb60f9..dc0b240 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -92,7 +92,7 @@ MODULE_VERSION(cd9660, 1);
  * Called by vfs_mountroot when iso is going to be mounted as root.
  */
 
-static int iso_get_ssector(dev_t dev, struct thread *td);
+static int iso_get_ssector(struct cdev *dev, struct thread *td);
 static int iso_mountfs(struct vnode *devvp, struct mount *mp,
 		       struct thread *td, struct iso_args *argp);
 
@@ -103,7 +103,7 @@ static int iso_mountfs(struct vnode *devvp, struct mount *mp,
  */
 static int
 iso_get_ssector(dev, td)
-	dev_t dev;
+	struct cdev *dev;
 	struct thread *td;
 {
 	struct ioc_toc_header h;
@@ -272,7 +272,7 @@ iso_mountfs(devvp, mp, td, argp)
 	register struct iso_mnt *isomp = (struct iso_mnt *)0;
 	struct buf *bp = NULL;
 	struct buf *pribp = NULL, *supbp = NULL;
-	dev_t dev = devvp->v_rdev;
+	struct cdev *dev = devvp->v_rdev;
 	int error = EINVAL;
 	int needclose = 0;
 	int high_sierra = 0;
@@ -707,7 +707,7 @@ cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir)
 	struct iso_node *ip;
 	struct buf *bp;
 	struct vnode *vp;
-	dev_t dev;
+	struct cdev *dev;
 	int error;
 
 	imp = VFSTOISOFS(mp);
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 4789e50..412f130 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -223,7 +223,7 @@ struct iso_mnt {
 	int im_flags;
 
 	struct mount *im_mountp;
-	dev_t im_dev;
+	struct cdev *im_dev;
 	struct vnode *im_devvp;
 
 	int logical_block_size;