Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

6 files changed, 10 insertions, 10 deletions

diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 3974be4..a48ea78 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1690,7 +1690,7 @@ ffs_blkfree(fs, devvp, bno, size, inum)
 	ufs2_daddr_t cgblkno;
 	int i, cg, blk, frags, bbase;
 	u_int8_t *blksfree;
-	dev_t dev;
+	struct cdev *dev;
 
 	cg = dtog(fs, bno);
 	if (devvp->v_type != VCHR) {
@@ -1886,7 +1886,7 @@ ffs_freefile(fs, devvp, ino, mode)
 	ufs2_daddr_t cgbno;
 	int error, cg;
 	u_int8_t *inosused;
-	dev_t dev;
+	struct cdev *dev;
 
 	cg = ino_to_cg(fs, ino);
 	if (devvp->v_type != VCHR) {
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 8f205db..f6de659 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -556,7 +556,7 @@ ffs_mountfs(devvp, mp, td)
 	struct ufsmount *ump;
 	struct buf *bp;
 	struct fs *fs;
-	dev_t dev;
+	struct cdev *dev;
 	void *space;
 	ufs2_daddr_t sblockloc;
 	int error, i, blks, size, ronly;
@@ -1222,7 +1222,7 @@ ffs_vget(mp, ino, flags, vpp)
 	struct ufsmount *ump;
 	struct buf *bp;
 	struct vnode *vp;
-	dev_t dev;
+	struct cdev *dev;
 	int error;
 
 	ump = VFSTOUFS(mp);
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index cedecd9..78e7e2a 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -131,7 +131,7 @@ struct ufs2_dinode {
  * The di_db fields may be overlaid with other information for
  * file types that do not have associated disk storage. Block
  * and character devices overlay the first data block with their
- * dev_t value. Short symbolic links place their path in the
+ * struct cdev *value. Short symbolic links place their path in the
  * di_db area.
  */
 #define	di_rdev di_db[0]
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index cabad78..56b48f2 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -72,11 +72,11 @@ int	 ufs_direnter(struct vnode *, struct vnode *, struct direct *,
 int	 ufs_dirremove(struct vnode *, struct inode *, int, int);
 int	 ufs_dirrewrite(struct inode *, struct inode *, ino_t, int, int);
 int	 ufs_getlbns(struct vnode *, ufs2_daddr_t, struct indir *, int *);
-int	 ufs_ihashget(dev_t, ino_t, int, struct vnode **);
+int	 ufs_ihashget(struct cdev *, ino_t, int, struct vnode **);
 void	 ufs_ihashinit(void);
 int	 ufs_ihashins(struct inode *, int, struct vnode **);
 struct vnode *
-	 ufs_ihashlookup(dev_t, ino_t);
+	 ufs_ihashlookup(struct cdev *, ino_t);
 void	 ufs_ihashrem(struct inode *);
 void	 ufs_ihashuninit(void);
 int	 ufs_inactive(struct vop_inactive_args *);
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index 6e6f743..ceaae67 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -83,7 +83,7 @@ ufs_ihashuninit()
  */
 struct vnode *
 ufs_ihashlookup(dev, inum)
-	dev_t dev;
+	struct cdev *dev;
 	ino_t inum;
 {
 	struct inode *ip;
@@ -105,7 +105,7 @@ ufs_ihashlookup(dev, inum)
  */
 int
 ufs_ihashget(dev, inum, flags, vpp)
-	dev_t dev;
+	struct cdev *dev;
 	ino_t inum;
 	int flags;
 	struct vnode **vpp;
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 43c2254..6d5352c 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -59,7 +59,7 @@ struct ufs_extattr_per_mount;
 /* This structure describes the UFS specific mount structure data. */
 struct ufsmount {
 	struct	mount *um_mountp;		/* filesystem vfs structure */
-	dev_t	um_dev;				/* device mounted */
+	struct cdev *um_dev;				/* device mounted */
 	struct	vnode *um_devvp;		/* block device mounted vnode */
 	u_long	um_fstype;			/* type of filesystem */
 	struct	fs *um_fs;			/* pointer to superblock */