Do the dreaded s/dev_t/struct cdev */

Bump __FreeBSD_version accordingly.

5 files changed, 6 insertions, 6 deletions

diff --git a/sys/fs/ntfs/ntfs.h b/sys/fs/ntfs/ntfs.h
index 6e19029ade46..1940ee9deea0 100644
--- a/sys/fs/ntfs/ntfs.h
+++ b/sys/fs/ntfs/ntfs.h
@@ -241,7 +241,7 @@ struct bootfile {
 struct ntfsmount {
 	struct mount   *ntm_mountp;	/* filesystem vfs structure */
 	struct bootfile ntm_bootfile;
-	dev_t           ntm_dev;	/* device mounted */
+	struct cdev *ntm_dev;	/* device mounted */
 	struct vnode   *ntm_devvp;	/* block device mounted vnode */
 	struct vnode   *ntm_sysvn[NTFS_SYSNODESNUM];
 	u_int32_t       ntm_bpmftrec;
diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c
index e434eafb0fc0..dd9ec2d4f386 100644
--- a/sys/fs/ntfs/ntfs_ihash.c
+++ b/sys/fs/ntfs/ntfs_ihash.c
@@ -83,7 +83,7 @@ ntfs_nthashdestroy(void)
  */
 struct ntnode *
 ntfs_nthashlookup(dev, inum)
-	dev_t dev;
+	struct cdev *dev;
 	ino_t inum;
 {
 	struct ntnode *ip;
diff --git a/sys/fs/ntfs/ntfs_ihash.h b/sys/fs/ntfs/ntfs_ihash.h
index eb3befd39180..7df7495c770a 100644
--- a/sys/fs/ntfs/ntfs_ihash.h
+++ b/sys/fs/ntfs/ntfs_ihash.h
@@ -31,7 +31,7 @@
 extern struct lock ntfs_hashlock;
 void ntfs_nthashinit(void);
 void ntfs_nthashdestroy(void);
-struct ntnode   *ntfs_nthashlookup(dev_t, ino_t);
-struct ntnode   *ntfs_nthashget(dev_t, ino_t);
+struct ntnode   *ntfs_nthashlookup(struct cdev *, ino_t);
+struct ntnode   *ntfs_nthashget(struct cdev *, ino_t);
 void ntfs_nthashins(struct ntnode *);
 void ntfs_nthashrem(register struct ntnode *);
diff --git a/sys/fs/ntfs/ntfs_inode.h b/sys/fs/ntfs/ntfs_inode.h
index 13ed4431da6c..c11cfa1f6317 100644
--- a/sys/fs/ntfs/ntfs_inode.h
+++ b/sys/fs/ntfs/ntfs_inode.h
@@ -43,7 +43,7 @@
 
 struct ntnode {
 	struct vnode   *i_devvp;	/* vnode of blk dev we live on */
-	dev_t           i_dev;		/* Device associated with the inode. */
+	struct cdev *i_dev;		/* Device associated with the inode. */
 
 	LIST_ENTRY(ntnode)	i_hash;
 	struct ntnode  *i_next;
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index a959e8c189e4..924f06f319da 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -273,7 +273,7 @@ ntfs_mountfs(devvp, mp, argsp, td)
 {
 	struct buf *bp;
 	struct ntfsmount *ntmp;
-	dev_t dev = devvp->v_rdev;
+	struct cdev *dev = devvp->v_rdev;
 	int error, ronly, ncount, i;
 	struct vnode *vp;