From nobody Fri Dec 06 02:24:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y4FTK2NCqz5g6k3; Fri, 06 Dec 2024 02:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y4FTK0RGHz44l8; Fri, 6 Dec 2024 02:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733451893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+VFxv+PqcwXeZ0Sm7JkJ5JuJPxB3Xt7DtPlbhj6Q3jk=; b=MLkCE4snMLXRRA25dhHhjLVEqvBTbE9FFKIhIZj6dWYo2kIiPoErySjuQASPG+gAKU1/N8 1mR/VGK9EoP2N2syC4HgHCw5JFljOb892CQkauj6r6bM6VVTkTlcT75l0Nfx+cavtlZUkW gMq7aJDKxzG1qpdEQhbG+8O2JdWiV3c305SpwK7e8JS+fl7EyUfI+b+rtw8DDbfxjRBmTC mLnz8+6YVbAUmmMfdDSfsFy18Y69klt5piT4m70RriAwwklyhVwxestdinqYpyY/hahD1I JzJJj2z2dn92sO9Hirl1+fhOItevBpGFbxxR0trGGHnkhONyokWDxHUvIb7NRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733451893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+VFxv+PqcwXeZ0Sm7JkJ5JuJPxB3Xt7DtPlbhj6Q3jk=; b=EhG5m9s6QyvVRPv3SMBQd2SFAiHe78T6AW2V/rGKThwqUG6YeKuq8AtolP3x09VKTzwgBc RLS4OrJ5IBgH3+/A2UjJFiHhl2MBOYqJ+Eaq338VmHgxYNvelBHkGxP3H0ARcugjkLeSaP SYy3xHxOemM1nqRqntYP/atVTOI+uOrAg+5RrJW85xoXKZcb65l+cdmQ2gpmPKcdPVh/tX Qo4u/aO99KvkV+/bVarqo33N1SmRPEC/71cw5dvgZxquk55olxI1WXX9yz2l3bV8kiaNGY yObsO565bk544FOlxHTBimaOHP8HI+4D1Fdlqzowr5XdPLL022Nab0UuG8Rx4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733451893; a=rsa-sha256; cv=none; b=Mbsd6Caab1tjSh9j2cnzm5Tj4LiG+b6rX7cBb/0iuO8Z24jIo4Fk7g/mEgBzoRpr1H5HfR 45QURU0X9iz5vEbTXCRr0Edj+/2UVh6mjt/J8dmUHE8vM0CB1o7C3CIOe7ylReW4OCYJBo Nk5hBeLrZiUHN/06uycMjMHKitUv+twJQv4jttR7IghTgDE/rxj0fdiXc/ei57n3N1q2Oo s8Is88XdW2nTLiPQzHZVz/q3LmpYFzHsXoasqNL/tfh3lPzWLJhXIdTgk94qiMWh0kmjz9 k84RGiMjbThKkLq23AHx9kQpHBNT8dM+xfR2lpdHzLWFnDkVKDT6FIww+RkmLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y4FTK039TzK1Y; Fri, 6 Dec 2024 02:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B62Oqa0034737; Fri, 6 Dec 2024 02:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B62Oqq0034734; Fri, 6 Dec 2024 02:24:52 GMT (envelope-from git) Date: Fri, 6 Dec 2024 02:24:52 GMT Message-Id: <202412060224.4B62Oqq0034734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 96e69c8e3167 - main - cd9660: Remove some unneeded definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96e69c8e3167a57b8b37317796eba3068d12a771 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=96e69c8e3167a57b8b37317796eba3068d12a771 commit 96e69c8e3167a57b8b37317796eba3068d12a771 Author: Mark Johnston AuthorDate: 2024-12-06 02:04:23 +0000 Commit: Mark Johnston CommitDate: 2024-12-06 02:24:41 +0000 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 --- sys/fs/cd9660/cd9660_lookup.c | 6 +++--- sys/fs/cd9660/cd9660_node.c | 6 +++--- sys/fs/cd9660/cd9660_node.h | 2 +- sys/fs/cd9660/cd9660_rrip.c | 2 +- sys/fs/cd9660/cd9660_vfsops.c | 8 ++++---- sys/fs/cd9660/cd9660_vnops.c | 2 +- sys/fs/cd9660/iso.h | 15 +++------------ sys/fs/cd9660/iso_rrip.h | 4 ++-- 8 files changed, 18 insertions(+), 27 deletions(-) diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index 569ee631416c..1adb7a18bcf1 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -47,8 +47,8 @@ #include 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; }; @@ -115,7 +115,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 67270b40f2b0..ce6ec3aa7a1c 100644 --- a/sys/fs/cd9660/cd9660_node.c +++ b/sys/fs/cd9660/cd9660_node.c @@ -281,10 +281,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 @@ -293,7 +293,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 9dc84dd57c0e..6021c1681c5d 100644 --- a/sys/fs/cd9660/cd9660_node.h +++ b/sys/fs/cd9660/cd9660_node.h @@ -56,7 +56,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 26825062d25a..d0b0008d10b2 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -593,7 +593,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 f067453d3458..814f49f58ae1 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -560,7 +560,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. @@ -660,15 +660,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 c41fccb394c2..c4d0e6ba7b30 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -443,7 +443,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 9b737e261a63..63ce5f50949a 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -218,15 +218,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; @@ -265,7 +256,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; @@ -276,7 +267,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) @@ -287,7 +278,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 bea0811eccf4..5a75beb08d93 100644 --- a/sys/fs/cd9660/iso_rrip.h +++ b/sys/fs/cd9660/iso_rrip.h @@ -63,7 +63,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 */ @@ -76,7 +76,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);