From nobody Tue Jan 02 20:52:33 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 4T4Q5s2D0dz56Hw7; Tue, 2 Jan 2024 20:52:33 +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 4T4Q5s1nxZz4XgD; Tue, 2 Jan 2024 20:52:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704228753; 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=cBHCWmAi4NfddbNcdqk4DmtrHuTucXh7MC5vyb2eNSA=; b=CwgNHduiFbEwToxioegvjUCJYR7d81d0C3XPwIa3WdUFSrH9wG2LcCGVY2u3ACB7nhlYyL zCSgChQMxJZoKozjOzQrtLYAohu7jQR5ki6NssH9u+R64qXKuFtpFwfOZXCVC5IDBmw8vd nb7exmwrqA8ww4vEVVrSO3Sq6cq5HfRRS9BMMq/g2xgV/XGhQkGTLoS2FVyuhKLwahjMLK 4IPD8c5kNBItapIJJG0TWuglCWymTEtTR6O6fsw08N6a/6VZEdV5dGPbDl8Eoi2cBYFXuy rPH6uy/ucsq65SR0wmRZlUBtzzbc7dg0OwQcSX6MoxNRYrHx5s98yU6pn4Vfow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704228753; a=rsa-sha256; cv=none; b=W1LeIz8/msKKPW64HCY6wPPCnR1+QRAUfK0hWeUFbEfiIYuu7T0Y6/F8NTDNYiHE1ktw+c F8O0k0bu3V7OiDAjaK1GetoMyq01acNl2p3AEkdg0ITHRt8d01icF6qpQA51grK/FPDti7 7wUL8Pe06oBS6XAvaGfgY8PvkVkoniJws2jqVna0eMHIWwXFJYkau/fX8GYESQmizPUPYm i2hk/h9h8Q72z7tOhzbi1DE0ZNi3vsmNQRMNobmdS0HSHYEl5kAgegujaAAT5LP64shslv zriFckxrCAw+A+9QeGoHVqD1RXwj8ltC2YDZrpUAO4aFWQwuyUS7KSsKoCCeMA== 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=1704228753; 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=cBHCWmAi4NfddbNcdqk4DmtrHuTucXh7MC5vyb2eNSA=; b=Afrn0h9PGNj/Iu6Cagpfad9G6ekw+wpXrSQha3cUzk0r6F/o2FjIVBKDyjRAoaP822W/AG UeK54Nk11J58J0EABmTXDHGQSrzhEcXppoGpbT2DmJFSZnYNoL8u1at4iF5CcbQO5jK+1T efh1xlxfDdsXN7IjWvH840+63SIZw865dd4OWcqGYB7Ecb8pUQe46T+VcyQ3ZroZid4eLi PUVKy0bHWyF8JSjTK2ayptQulIF+jdP9egFJjU8p+67IDAL+n2ES+5oNDdQoyOL6Nql3fn Xv1QggZTu2fPT9oJ8VWJQPiALiOVG+zwtXIjGb2Tbcw3R/BoyqnVNf3+KyXZXA== 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 4T4Q5s0skcz1G97; Tue, 2 Jan 2024 20:52:33 +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 402KqXih036753; Tue, 2 Jan 2024 20:52:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 402KqXX8036750; Tue, 2 Jan 2024 20:52:33 GMT (envelope-from git) Date: Tue, 2 Jan 2024 20:52:33 GMT Message-Id: <202401022052.402KqXX8036750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 46b03fd89887 - stable/14 - ctl: Make ctl.h more self-contained 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 46b03fd89887bd43b7ad25d0cf7c5c5030a9446a Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=46b03fd89887bd43b7ad25d0cf7c5c5030a9446a commit 46b03fd89887bd43b7ad25d0cf7c5c5030a9446a Author: John Baldwin AuthorDate: 2023-10-16 22:45:15 +0000 Commit: John Baldwin CommitDate: 2024-01-02 19:20:37 +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 (cherry picked from commit 55231cd180692c7299bff65e608dba20013ec0f7) --- 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