From nobody Mon Oct 16 22:48:00 2023 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 4S8XM469D1z4xtL2; Mon, 16 Oct 2023 22:48:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8XM45kCcz4Xsx; Mon, 16 Oct 2023 22:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496480; 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=6oegKRbJEmDiq9TfI4iMZWGdj++AxMH2jjbJrNGujnU=; b=IRoEqbtZ/Wy7x4aAmQrC6GmERtXwGeFkAgJ1GKVqQfkhwzNpLcW9fG4UjbSZFZLGMvQLgL pjkZgptv+erbQHdcr/J8QrnWaO1aPly9XHg5CbxoH2XTlUitWs9eMtz5UkFmPDSbOM92o/ Nr+sc74lWgIuv4tZhZutmldvWiPsYZDnRHiB4izV3iat635xsjEtp9JFg/qQvI9F8mjzSV 3/HOPNDvy9VIjgHfsd0x3HM5fn41AWp0+oP0WZ/VmAk3a6S/EhfjGUs8Oz8wi/IYaXgyGA KjCH3etpyUYBodfcYUacgywz6sGV50nMbtteba9wqQaR2f+kQP4G8u14y4QW6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496480; a=rsa-sha256; cv=none; b=aJ0w4+kmNRC41+n56HnymAapDzeDXB2AUNxmP0ubjI4929qcppz6sqfxOB9O6ZTE/Kf46G Q5fnZAAcyKJI4UDJjpK7cSaJDSN1Pobsi/hMUVALBpZGZmydaHp/SgIsc6FR7BNhQG+fFL 7qG8GQAZ9taRq8E7lmoWfKVyKGwNzfx89qvaOLifOYe3PvPNakS5LVAYWcW1ln/rR2wOtf TC1lIqCES9gj/SLo9rCDOFKsgBB1/y0GQVQk9cVZyushbgLmxp5i6NjVsPdCJJ7oUxLY9+ M7yfz+Ar34n2jQCghSZAg4ZVCRUOSOOzxCj+6puWH1yl22jF4FBNz3oFmaSSsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496480; 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=6oegKRbJEmDiq9TfI4iMZWGdj++AxMH2jjbJrNGujnU=; b=MVES/rkNIcm1Cib3IX1TpU4lYAH9h+PtKECLmrMjdHlMwwps/5QNW54jqQdCAClr29wUIT WuKbqZZG1wJE0xEGIduIqs4gUtSOHX+drCBi6OjWSY8CWBAoCLP+5bhfJV89Jqeu6Xqykt jz8yBgMv6wguWF8BAxQQBWXZnM5X05Db+y93XdO80NjrXOwRXPrC8bw+/sN1Mx88vYJ6tN PFaL5KoHqKHmsYCtw7iajj0sjPSAOyPlgNIMvA3vHBCQw3FXwjD2Mz8MbiVbEjVDSPOf6d /EaAlLi1OXAf88epSeOlG08gHM2dpF3snY+fbzoA7L3yTkQnKWU6w2BiglKNxA== 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 4S8XM44YtCzygj; Mon, 16 Oct 2023 22:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMm0OF012640; Mon, 16 Oct 2023 22:48:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm0nO012637; Mon, 16 Oct 2023 22:48:00 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:00 GMT Message-Id: <202310162248.39GMm0nO012637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 55231cd18069 - main - ctl: Make ctl.h more self-contained 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55231cd180692c7299bff65e608dba20013ec0f7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=55231cd180692c7299bff65e608dba20013ec0f7 commit 55231cd180692c7299bff65e608dba20013ec0f7 Author: John Baldwin AuthorDate: 2023-10-16 22:45:15 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:45:15 +0000 ctl: Make ctl.h more self-contained Make MALLOC_DECLARE conditional on and forward declare several types. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42206 --- sys/cam/ctl/ctl.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h index 1b7d7ad4ec38..a211e249b2dc 100644 --- a/sys/cam/ctl/ctl.h +++ b/sys/cam/ctl/ctl.h @@ -129,7 +129,9 @@ typedef enum { #ifdef _KERNEL +#ifdef MALLOC_DECLARE /* from malloc.h */ MALLOC_DECLARE(M_CTL); +#endif struct ctl_page_index; @@ -137,9 +139,13 @@ struct ctl_page_index; SYSCTL_DECL(_kern_cam_ctl); #endif +struct cdev; struct ctl_lun; struct ctl_port; struct ctl_softc; +struct ctl_scsiio; +struct sbuf; +union ctl_io; /* * Put a string into an sbuf, escaping characters that are illegal or not