From nobody Mon Jun 16 21:37:24 2025 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 4bLjyX4S1sz5yS06; Mon, 16 Jun 2025 21:37:24 +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 4bLjyX1Bg1z3Jh3; Mon, 16 Jun 2025 21:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109844; 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=MwS0Rh23OFtvuEXNXL1Qqx45WojGbM8YvRGsrUVxgdM=; b=qZ3TwbJuIGz1bA2xb9zUDgTDtRQhuwJ3V2yBmx4gxCLTGrkbQigBxRNC48pQL4t5bFzg96 AxnOHFxWug5iHDFkOUKqtWlo6tXdF8GQsimjPolXy696hPG26HrEyaP95c3MOtYOf0uihr bbHmnhF2ExkQpktceNlh1JPng7Pu1rf3xHeVLjPvUTJDhmgGIjLOOl5OQg+6FKAvPD5Tc0 ikI9D+BQnPiG2FDPmcGpKzMtulcAwNtIDT8JzEaifXPiqn/z88HUAV6QFPERZ4/5SCNWnG OvAC/jDzN5G7D4CMP1oLwb8FVdIQJuKvb4jSxcVbgC0Ddh7KCxQvi5vnkBZDLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750109844; 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=MwS0Rh23OFtvuEXNXL1Qqx45WojGbM8YvRGsrUVxgdM=; b=AuBCz2uMQN701WB77aeJGoIXu6lYit0yzetdIwnjrYWWzUxT8XflNjbdNuPZwgfCTLupBG zwV5rJ91aDYBxri1asg5guqmcho/DMyA2GwUASmnXJ84jvoTp31Gspf5W+RjnOt3w7ISsI wfM073fM6pAEhbUtcjh+/gUXZ2fVn8PKlqTtuqREPl4BX/iMzKU08jTymEdMR0WR7Jnpay 7EBxmsYkT0yipnX4hY5Vzrre5BAaQXCxcevFHlVwO/Q4oxXmgh4DIfAdok0w6ZN1NBBdFc 94uJYdvKRNO/TRzluCzBeAw8p75uBw0cMFTGyJ9MMsNCxzCDnE4G+nARmmTXSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750109844; a=rsa-sha256; cv=none; b=kw8NvZiJfFR9Vuq49bAvhhFSpunRAox232RDCRZwM8pMx9LicQVSlXOpH43h9/DJGhQw12 km55hzsFQzV5diJNMRx19/9Pa+iMAQxIU0faVQzwzRrfAwfUWfS0kePjnJcm2fAn7RQZjd 7D6xS1bSNUpUY+mNOYVZmMRgjH9W53/3OnMVykvhI1i/ol/ilX0SzyxZYFVE+VUfJM/VYR QVkava4MyU/NntH+OB805vR7ByeKU2vlOGtibGTyp7R0AxJBU6sN+r1BgtHB+aHPQy9ILm FSpXHMiOiRtjXE9ceoUt9hhSCVtA0HYlOTnlNmz6vj/Gyz+c/mArwXVjOoIREg== 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 4bLjyX0pRrzbQ; Mon, 16 Jun 2025 21:37:24 +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 55GLbO9v073025; Mon, 16 Jun 2025 21:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55GLbOg6073022; Mon, 16 Jun 2025 21:37:24 GMT (envelope-from git) Date: Mon, 16 Jun 2025 21:37:24 GMT Message-Id: <202506162137.55GLbOg6073022@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: c4d3a1836d50 - main - msdosfs: Don't #ifdef out msdosfsmount members 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4d3a1836d50f66de71384bf7e824b2c49f914a3 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c4d3a1836d50f66de71384bf7e824b2c49f914a3 commit c4d3a1836d50f66de71384bf7e824b2c49f914a3 Author: Jessica Clarke AuthorDate: 2025-06-16 21:33:07 +0000 Commit: Jessica Clarke CommitDate: 2025-06-16 21:33:07 +0000 msdosfs: Don't #ifdef out msdosfsmount members Whilst these aren't used by makefs, they do little harm existing once the needed headers are included, and having structs change layout based on defines like this can be fraught. This will be particularly true once this code is exposed by defines other than _KERNEL and MAKEFS, as any consumer will be able to opt into exposing this kernel type and all the definitions should match. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50885 --- sys/fs/msdosfs/msdosfsmount.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h index 8f15bc2eaf42..adfc7e4d0e88 100644 --- a/sys/fs/msdosfs/msdosfsmount.h +++ b/sys/fs/msdosfs/msdosfsmount.h @@ -58,8 +58,11 @@ #ifndef MAKEFS #include #include -#include +#else +#include +#include #endif +#include #include #ifdef MALLOC_DECLARE @@ -114,11 +117,9 @@ struct msdosfsmount { void *pm_w2u; /* Unicode->Local iconv handle */ void *pm_u2d; /* Unicode->DOS iconv handle */ void *pm_d2u; /* DOS->Local iconv handle */ -#ifndef MAKEFS struct lock pm_fatlock; /* lockmgr protecting allocations */ struct lock pm_checkpath_lock; /* protects doscheckpath result */ struct task pm_rw2ro_task; /* context for emergency remount ro */ -#endif }; /*