The branch main has been updated by jrtc27:
URL:
https://cgit.FreeBSD.org/src/commit/?id=68c3cec90a87d0d833a34f58135be9a1b063087a
commit 68c3cec90a87d0d833a34f58135be9a1b063087a
Author: Jessica Clarke <jrt...@freebsd.org>
AuthorDate: 2025-06-16 21:32:09 +0000
Commit: Jessica Clarke <jrt...@freebsd.org>
CommitDate: 2025-06-16 21:32:09 +0000
cd9660: Add _WANT_ISO_MNT
This allows struct iso_mnt to be defined for userspace without resorting
to the gross hack of defining _KERNEL. In particular, it will be used by
libprocstat so it can stop defining _KERNEL.
Reviewed by: imp, kib, markj
Differential Revision: https://reviews.freebsd.org/D50717
---
sys/fs/cd9660/iso.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 63ce5f50949a..40047cc92de6 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -212,7 +212,7 @@ struct iso_extended_attributes {
u_char len_au [ISODCL (247, 250)]; /* 723 */
};
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_WANT_ISO_MNT)
/* CD-ROM Format type */
enum ISO_FTYPE { ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP,
@@ -253,6 +253,10 @@ struct iso_mnt {
void *im_l2d;
};
+#endif /* defined(_KERNEL) || defined(_WANT_ISO_MNT) */
+
+#ifdef _KERNEL
+
struct ifid {
u_short ifid_len;
u_short ifid_pad;
