cd9660: Remove some unneeded definitions

- cd_ino_t can be dropped since ino_t is now 64 bits wide.
- ISOFSMNT_ROOT is unused (and defined only for the kernel).

No functional change intended.

Reviewed by:	olce, imp, kib, emaste
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D47880

(cherry picked from commit 96e69c8e3167a57b8b37317796eba3068d12a771)

8 files changed, 18 insertions, 27 deletions

diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 0b12a5ffd52e..02e9c6bb5aa6 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -51,8 +51,8 @@
 #include <fs/cd9660/iso_rrip.h>
 
 struct cd9660_ino_alloc_arg {
-	cd_ino_t ino;
-	cd_ino_t i_ino;
+	ino_t ino;
+	ino_t i_ino;
 	struct iso_directory_record *ep;
 };
 
@@ -119,7 +119,7 @@ cd9660_lookup(struct vop_cachedlookup_args *ap)
 	struct cd9660_ino_alloc_arg dd_arg;
 	u_long bmask;			/* block offset mask */
 	int error;
-	cd_ino_t ino, i_ino;
+	ino_t ino, i_ino;
 	int ltype, reclen;
 	u_short namelen;
 	int isoflags;
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index f6855b0e3d5d..0fbd9916a17a 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -284,10 +284,10 @@ cd9660_tstamp_conv17(u_char *pi, struct timespec *pu)
 	return cd9660_tstamp_conv7(buf, pu, ISO_FTYPE_DEFAULT);
 }
 
-cd_ino_t
+ino_t
 isodirino(struct iso_directory_record *isodir, struct iso_mnt *imp)
 {
-	cd_ino_t ino;
+	ino_t ino;
 
 	/*
 	 * Note there is an inverse calculation in
@@ -296,7 +296,7 @@ isodirino(struct iso_directory_record *isodir, struct iso_mnt *imp)
 	 * and also a calculation of the isodir pointer
 	 * from an inode in cd9660_vnops.c:cd9660_readlink()
 	 */
-	ino = ((cd_ino_t)isonum_733(isodir->extent) +
+	ino = ((ino_t)isonum_733(isodir->extent) +
 		isonum_711(isodir->ext_attr_length)) << imp->im_bshift;
 	return ino;
 }
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index b1fc187f503d..a9506cb4b68e 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -58,7 +58,7 @@ typedef	struct	{
 
 struct iso_node {
 	struct	vnode *i_vnode;	/* vnode associated with this inode */
-	cd_ino_t	i_number;	/* the identity of the inode */
+	ino_t	i_number;	/* the identity of the inode */
 				/* we use the actual starting block of the file */
 	struct	iso_mnt *i_mnt;	/* filesystem associated with this inode */
 	struct	lockf *i_lockf;	/* head of byte-level lock list */
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index f53d483d24e9..d3b8ccab16ae 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -596,7 +596,7 @@ static RRIP_TABLE rrip_table_getname[] = {
 
 int
 cd9660_rrip_getname(struct iso_directory_record *isodir, char *outbuf,
-    u_short *outlen, cd_ino_t *inump, struct iso_mnt *imp)
+    u_short *outlen, ino_t *inump, struct iso_mnt *imp)
 {
 	ISO_RRIP_ANALYZE analyze;
 	RRIP_TABLE *tab;
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 25a56ea1595e..76c20c3cf5ca 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -563,7 +563,7 @@ cd9660_root(struct mount *mp, int flags, struct vnode **vpp)
 	struct iso_mnt *imp = VFSTOISOFS(mp);
 	struct iso_directory_record *dp =
 	    (struct iso_directory_record *)imp->root;
-	cd_ino_t ino = isodirino(dp, imp);
+	ino_t ino = isodirino(dp, imp);
 
 	/*
 	 * With RRIP we must use the `.' entry of the root directory.
@@ -663,15 +663,15 @@ static int
 cd9660_vfs_hash_cmp(struct vnode *vp, void *pino)
 {
 	struct iso_node *ip;
-	cd_ino_t ino;
+	ino_t ino;
 
 	ip = VTOI(vp);
-	ino = *(cd_ino_t *)pino;
+	ino = *(ino_t *)pino;
 	return (ip->i_number != ino);
 }
 
 int
-cd9660_vget_internal(struct mount *mp, cd_ino_t ino, int flags,
+cd9660_vget_internal(struct mount *mp, ino_t ino, int flags,
     struct vnode **vpp, int relocated, struct iso_directory_record *isodir)
 {
 	struct iso_mnt *imp;
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 31dacb392a6b..ddc5fa8b0f38 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -446,7 +446,7 @@ cd9660_readdir(struct vop_readdir_args *ap)
 	u_short namelen;
 	u_int ncookies = 0;
 	uint64_t *cookies = NULL;
-	cd_ino_t ino;
+	ino_t ino;
 
 	dp = VTOI(vdp);
 	imp = dp->i_mnt;
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index b54f5f8e5cf4..4a35bee59bcc 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -220,15 +220,6 @@ struct iso_extended_attributes {
 enum ISO_FTYPE	{ ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP,
 		  ISO_FTYPE_JOLIET, ISO_FTYPE_ECMA, ISO_FTYPE_HIGH_SIERRA };
 
-#ifndef	ISOFSMNT_ROOT
-#define	ISOFSMNT_ROOT	0
-#endif
-
-/*
- * When ino_t becomes 64-bit, we can remove this definition in favor of ino_t.
- */
-typedef __uint64_t cd_ino_t;
-
 struct iso_mnt {
 	uint64_t im_flags;
 
@@ -267,7 +258,7 @@ struct iso_mnt {
 struct ifid {
 	u_short		ifid_len;
 	u_short		ifid_pad;
-	cd_ino_t	ifid_ino;
+	ino_t		ifid_ino;
 	long		ifid_start;
 } __packed;
 
@@ -278,7 +269,7 @@ struct ifid {
 #define lblkno(imp, loc)	((loc) >> (imp)->im_bshift)
 #define blksize(imp, ip, lbn)	((imp)->logical_block_size)
 
-int cd9660_vget_internal(struct mount *, cd_ino_t, int, struct vnode **, int,
+int cd9660_vget_internal(struct mount *, ino_t	, int, struct vnode **, int,
 			 struct iso_directory_record *);
 #define cd9660_sysctl ((int (*)(int *, u_int, void *, size_t *, void *, \
 				size_t, struct proc *))eopnotsupp)
@@ -289,7 +280,7 @@ extern struct vop_vector cd9660_fifoops;
 int isochar(u_char *, u_char *, int, u_short *, int *, int, void *);
 int isofncmp(u_char *, int, u_char *, int, int, int, void *, void *);
 void isofntrans(u_char *, int, u_char *, u_short *, int, int, int, int, void *);
-cd_ino_t isodirino(struct iso_directory_record *, struct iso_mnt *);
+ino_t isodirino(struct iso_directory_record *, struct iso_mnt *);
 u_short sgetrune(const char *, size_t, char const **, int, void *);
 
 #endif /* _KERNEL */
diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h
index 09917893df15..a11cd825b826 100644
--- a/sys/fs/cd9660/iso_rrip.h
+++ b/sys/fs/cd9660/iso_rrip.h
@@ -65,7 +65,7 @@ typedef struct {
 	off_t		iso_ce_off;	/* offset of continuation area */
 	int		iso_ce_len;	/* length of continuation area */
 	struct iso_mnt	*imp;		/* mount structure */
-	cd_ino_t	*inump;		/* inode number pointer */
+	ino_t		*inump;		/* inode number pointer */
 	char		*outbuf;	/* name/symbolic link output area */
 	u_short		*outlen;	/* length of above */
 	u_short		maxlen;		/* maximum length of above */
@@ -78,7 +78,7 @@ int cd9660_rrip_analyze(struct iso_directory_record *isodir,
 			    struct iso_node *inop, struct iso_mnt *imp);
 int cd9660_rrip_getname(struct iso_directory_record *isodir,
 			    char *outbuf, u_short *outlen,
-			    cd_ino_t *inump, struct iso_mnt *imp);
+			    ino_t *inump, struct iso_mnt *imp);
 int cd9660_rrip_getsymname(struct iso_directory_record *isodir,
 			       char *outbuf, u_short *outlen,
 			       struct iso_mnt *imp);