ctl: Move extern for control_softc into <cam/ctl/ctl_private.h>

Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D46778
bsdjhb · Sep 25, 2024 · b1d324d · b1d324d
1 parent 0063ef7
commit b1d324d
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 9 deletions.
diff --git a/sys/cam/ctl/ctl_backend.c b/sys/cam/ctl/ctl_backend.c
@@ -59,8 +59,6 @@
 #include <cam/ctl/ctl_private.h>
 #include <cam/ctl/ctl_debug.h>
 
-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
@@ -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
@@ -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
@@ -64,8 +64,6 @@
 #include <cam/ctl/ctl_private.h>
 #include <cam/ctl/ctl_debug.h>
 
-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
@@ -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
@@ -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;