From nobody Wed Sep 25 14:21:35 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 4XDJnW3mrfz5XXCQ; Wed, 25 Sep 2024 14:21:35 +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 4XDJnW3LK4z4Fnk; Wed, 25 Sep 2024 14:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727274095; 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=wkiRFreVUFCqQm1yhy9C1vPTEbMgFlk919hGWDuF5IQ=; b=bjlm5eRJNnQXinlZT+L6ciVp2brvEmY3hc6nIoFetWKKoe0OvpWAA0FEWPo8MWZ0H073WI 1Z7b760CVaoj9XfdPkntPAJzLoQiFBQ9Ap03ifL94SKCd/Eq6Xrqkwlm2wAVYtJuwCVo18 YGJnCnhPOxCU+gu3aEI6o7N4D8+O8YCWH7IxdLBGvUYHUQo8KELe3G78oPaYaRDKB1Vn/i x7mN1LM7z8QOjgEMgMFEEvVGHVmjwOTdM71YGtyJmcyU2kgQ5673ogciUyfaPt5lDiWG7g SU+MxLoCGSLdRQ07WVqtu9WfoTavAePYsH6LgXwHCgzQue8gwRecAraOBHCFew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727274095; 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=wkiRFreVUFCqQm1yhy9C1vPTEbMgFlk919hGWDuF5IQ=; b=orG5GmgjNfPirpmXI9SbusgMC/HHnmUJwgbm1Cm6xh+lgA4mUyYJqY1xnM51x+BV+Dpt7K kK6ZM6M8JWEpmc/AWmsh2EeD4Qoy6/T2PrWxm2hzr2Eqyatw/HErfTTBkqCh8kJAgFmHLg T77ZjsrwKc8coSuvdsda/qArWq/W9cL2LLwj9NTuXYXuRo8UYv0QRp+7+WHatXwBLR3V8I rb7aIZloho3ESSOBE9SuGlLPjnVk+BYFIOotJxnO7Ai8VEKMtr78XgJQNiSRhDo/z9sVK3 73ISJqH+YvqF1AcUMxG6fa3t1+Vt9dRK31W4nvvlsHz7U0PLi7Q4Gr7Fzz9Dvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727274095; a=rsa-sha256; cv=none; b=OZ4xrFRylxBd2xpn0Ot+g0eb+35WjTTPNty8RZpORC2IyFrM2Wd9WgG4Fcl8tE5yZt5+ZW Xn1gFnMZrzVBvCLgRcnzD6uAo/M630Rh79b7UKV5b4n2g1PCUWt+2pYpJ/VdBAuKeybcCM Ze3WxqDI0hspFG0dcGcCxVXSAgOscUp2eWYtyyCWZwFA4VkUE3YsP9dtHj9MIzoNyLdtWN UEshsHIEUbqIMQPJfmEQWIlHA3qznRz7ZdLJN1X/fvF9zIoVYW+ZigrnvxYkWfhg6L1uKh us0bwvyXHiL2IKzbTA20xtuHPHRlV0ulTjPUUerbJfhc8VxrQ83FtddtyyoPqQ== 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 4XDJnW2dJMzGN4; Wed, 25 Sep 2024 14:21:35 +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 48PELZnb057305; Wed, 25 Sep 2024 14:21:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48PELZU3057302; Wed, 25 Sep 2024 14:21:35 GMT (envelope-from git) Date: Wed, 25 Sep 2024 14:21:35 GMT Message-Id: <202409251421.48PELZU3057302@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: b1d324d98761 - main - ctl: Move extern for control_softc into 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1d324d98761a8640aef94c76cbccafc22c8dcc8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b1d324d98761a8640aef94c76cbccafc22c8dcc8 commit b1d324d98761a8640aef94c76cbccafc22c8dcc8 Author: John Baldwin AuthorDate: 2024-09-25 14:21:18 +0000 Commit: John Baldwin CommitDate: 2024-09-25 14:21:18 +0000 ctl: Move extern for control_softc into Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D46778 --- sys/cam/ctl/ctl_backend.c | 2 -- sys/cam/ctl/ctl_backend_block.c | 2 -- sys/cam/ctl/ctl_backend_ramdisk.c | 1 - sys/cam/ctl/ctl_frontend.c | 2 -- sys/cam/ctl/ctl_private.h | 1 + sys/dev/nvmf/controller/ctl_frontend_nvmf.c | 2 -- 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/cam/ctl/ctl_backend.c b/sys/cam/ctl/ctl_backend.c index a2249b5d8f44..c2b5e0f32fcc 100644 --- a/sys/cam/ctl/ctl_backend.c +++ b/sys/cam/ctl/ctl_backend.c @@ -59,8 +59,6 @@ #include #include -extern struct ctl_softc *control_softc; - int ctl_backend_register(struct ctl_backend_driver *be) { diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c index 55a5ce0d047a..8c2174249a95 100644 --- a/sys/cam/ctl/ctl_backend_block.c +++ b/sys/cam/ctl/ctl_backend_block.c @@ -225,8 +225,6 @@ struct ctl_be_block_io { void (*beio_cont)(struct ctl_be_block_io *beio); /* to continue processing */ }; -extern struct ctl_softc *control_softc; - static int cbb_num_threads = 32; SYSCTL_NODE(_kern_cam_ctl, OID_AUTO, block, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "CAM Target Layer Block Backend"); diff --git a/sys/cam/ctl/ctl_backend_ramdisk.c b/sys/cam/ctl/ctl_backend_ramdisk.c index 49ed05f54a58..dc73c22bce41 100644 --- a/sys/cam/ctl/ctl_backend_ramdisk.c +++ b/sys/cam/ctl/ctl_backend_ramdisk.c @@ -132,7 +132,6 @@ struct ctl_be_ramdisk_softc { }; static struct ctl_be_ramdisk_softc rd_softc; -extern struct ctl_softc *control_softc; static int ctl_backend_ramdisk_init(void); static int ctl_backend_ramdisk_shutdown(void); diff --git a/sys/cam/ctl/ctl_frontend.c b/sys/cam/ctl/ctl_frontend.c index 1e4d130950c4..6c7796bf0c82 100644 --- a/sys/cam/ctl/ctl_frontend.c +++ b/sys/cam/ctl/ctl_frontend.c @@ -64,8 +64,6 @@ #include #include -extern struct ctl_softc *control_softc; - int ctl_frontend_register(struct ctl_frontend *fe) { diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h index 821aa0aa681b..f27a8f2d423a 100644 --- a/sys/cam/ctl/ctl_private.h +++ b/sys/cam/ctl/ctl_private.h @@ -426,6 +426,7 @@ struct ctl_softc { #ifdef _KERNEL +extern struct ctl_softc *control_softc; extern const struct ctl_cmd_entry ctl_cmd_table[256]; extern const struct ctl_nvme_cmd_entry nvme_admin_cmd_table[256]; extern const struct ctl_nvme_cmd_entry nvme_nvm_cmd_table[256]; diff --git a/sys/dev/nvmf/controller/ctl_frontend_nvmf.c b/sys/dev/nvmf/controller/ctl_frontend_nvmf.c index bc061947a9a0..3d09ee901886 100644 --- a/sys/dev/nvmf/controller/ctl_frontend_nvmf.c +++ b/sys/dev/nvmf/controller/ctl_frontend_nvmf.c @@ -51,8 +51,6 @@ static int nvmft_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int flag, struct thread *td); static int nvmft_shutdown(void); -extern struct ctl_softc *control_softc; - static struct taskqueue *nvmft_taskq; static TAILQ_HEAD(, nvmft_port) nvmft_ports; static struct sx nvmft_ports_lock;