libzpool: separate driver-side include

Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Rob Norris <[email protected]>
Closes #17861

Author: robn

cmd/raidz_test/raidz_test.c

@@ -33,6 +33,7 @@
 #include <sys/vdev_raidz_impl.h>
 #include <assert.h>
 #include <stdio.h>
+#include <libzpool.h>
 #include "raidz_test.h"
 
 static int *rand_data;

cmd/zdb/zdb.c

@@ -89,6 +89,7 @@
 #include <sys/zstd/zstd.h>
 #include <sys/backtrace.h>
 
+#include <libzpool.h>
 #include <libnvpair.h>
 #include <libzutil.h>
 #include <libzfs_core.h>

cmd/zhack.c

@@ -55,6 +55,7 @@
 #include <zfeature_common.h>
 #include <libzutil.h>
 #include <sys/metaslab_impl.h>
+#include <libzpool.h>
 
 static importargs_t g_importargs;
 static char *g_pool;

cmd/ztest.c

@@ -139,6 +139,7 @@
 #include <sys/crypto/icp.h>
 #include <sys/zfs_impl.h>
 #include <sys/backtrace.h>
+#include <libzpool.h>
 
 static int ztest_fd_data = -1;
 static int ztest_fd_rand = -1;

include/Makefile.am

@@ -191,6 +191,7 @@ USER_H = \
 	libzfs.h \
 	libzfs_core.h \
 	libzfsbootenv.h \
+	libzpool.h \
 	libzutil.h \
 	thread_pool.h
 

include/libzpool.h

@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: CDDL-1.0
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or https://opensource.org/licenses/CDDL-1.0.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012, 2018 by Delphix. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ */
+
+#ifndef _LIBZPOOL_H
+#define	_LIBZPOOL_H extern __attribute__((visibility("default")))
+
+#include <sys/zfs_context.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+_LIBZPOOL_H void kernel_init(int mode);
+_LIBZPOOL_H void kernel_fini(void);
+
+struct spa;
+_LIBZPOOL_H void show_pool_stats(struct spa *);
+_LIBZPOOL_H int handle_tunable_option(const char *, boolean_t);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif

include/sys/zfs_context.h

@@ -230,15 +230,9 @@ random_in_range(uint32_t range)
 	return (r % range);
 }
 
-extern void kernel_init(int mode);
-extern void kernel_fini(void);
 extern void random_init(void);
 extern void random_fini(void);
 
-struct spa;
-extern void show_pool_stats(struct spa *);
-extern int handle_tunable_option(const char *, boolean_t);
-
 typedef struct callb_cpr {
 	kmutex_t	*cc_lockp;
 } callb_cpr_t;

lib/libzpool/kernel.c

@@ -45,6 +45,9 @@
 #include <sys/time.h>
 #include <sys/tsd.h>
 #include <sys/utsname.h>
+
+#include <libspl.h>
+#include <libzpool.h>
 #include <sys/zfs_context.h>
 #include <sys/zfs_onexit.h>
 #include <sys/zfs_vfsops.h>

lib/libzpool/util.c

@@ -38,6 +38,7 @@
 #include <sys/zfs_ioctl.h>
 #include <sys/tunables.h>
 #include <libzutil.h>
+#include <libzpool.h>
 
 /*
  * Routines needed by more than one client of libzpool.