From nobody Mon Jun 16 21:37:22 2025 X-Original-To: dev-commits-src-main@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 4bLjyW3tcrz5yS51; Mon, 16 Jun 2025 21:37:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLjyW0XKcz3Jpb; Mon, 16 Jun 2025 21:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109843; 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=/Ox6gJDTcBaS3SzakkEyIZb/2+/lmEV8fS3UxGt5VAY=; b=qasuaomBRlGboARYZvvJY1/ssMawEsh590ojEtTL98xVcv8HcBrKMHInblue/QH4qtxpaV YN+XnROaBpo/drCaqUwsTUIg/3ThaiyzEN6sutI9m9jbZpOXtg0K/e0CTMS2FF5C2VeK8P mTqwNijwZ0nYijGPJ86anyDCf9wMyHVEyzIsTLTMdutNjNnSsv8mMARzOhwyZQluQvk4GD I3vO8gEhdHQkHcS2GH8i5mMdG26gXGZI2N3OHm2YS8ElY3cUpSWIcWwn8qRnuwBI749odu kidknBsYKRjo0n3VDuIc6V1GO6rL+gK1Vd5mW8Zm2hgY9e1HA/LgekHSOcZCYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109843; 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=/Ox6gJDTcBaS3SzakkEyIZb/2+/lmEV8fS3UxGt5VAY=; b=KtAVAdDI4ASIcCjCJa8xE9i1NgySx4pmMHzEob1WxczbsVRoKiba0dwjycu87jq2Q/slHn 6+3Wwm/M9pJW6c8wFKv1DT9ZULnNCUYAozDGQCGSGUkdBwr0H1BKLEF0+ZcIOJSjsPI+O5 lCk+Fz6GpZ7Upwf8GMGf4FSBen2LHdgULN6lBs/hKJ4NaumT8R6xMUtUsV7nH8xcKU1coJ VcUYnPSgp2Z1NM6lXl54N3KpxlM+Ap9miO/qC1WfkPpUgwvNNuJN1gnU7m3b0EzOPQy9I0 hjXerra5E9G/sZKBusT34RGXxNlTehCkOrhK4FoDd45bRSrPjFarQ7kEOzArRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109843; a=rsa-sha256; cv=none; b=RAG5I8KQQFj97+EXG6WiWxrXMvimQQYPdBuXHffIstBMB05GrwkVp63ZEdKzddKgzbRfAU fCHxja9iwC3i6O4bKB3Ml4PUd04DNyGNQTbUNTg0SEbBRZ5kvrHQ/iN5WIMpY2J+0KB/R8 5qwE8rgcYmIH4w4QtkyKZ7RjO1UV6aU9CRsx8GAqHOKYkEm3fdajgeOl1v8UfM3i1lJjfz uCbnrDOr+khF7isTfrhTq5ySh2MVZFoP6iDUsyrtpmxRQwlSStipl8yLejxFzwfkNEyLTA jScO024hq1faa6C4p6r6yk41UQzTlrrWSWDA+1pJcE1M5clEhFBs1WOyDykCbg== 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 4bLjyV72LzzbP; Mon, 16 Jun 2025 21:37:22 +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 55GLbMR7072992; Mon, 16 Jun 2025 21:37:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbMR9072989; Mon, 16 Jun 2025 21:37:22 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:22 GMT Message-Id: <202506162137.55GLbMR9072989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 68c3cec90a87 - main - cd9660: Add _WANT_ISO_MNT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68c3cec90a87d0d833a34f58135be9a1b063087a Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=68c3cec90a87d0d833a34f58135be9a1b063087a commit 68c3cec90a87d0d833a34f58135be9a1b063087a Author: Jessica Clarke AuthorDate: 2025-06-16 21:32:09 +0000 Commit: Jessica Clarke 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;