libzfs: don't distribute libzfs_impl.h

Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Matthew Ahrens <[email protected]> Reviewed-by: John Kennedy <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #12048
openzfs · Jun 3, 2021 · eefaa55 · eefaa55
1 parent 94f942c
commit eefaa55
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 10 deletions.
diff --git a/include/Makefile.am b/include/Makefile.am
@@ -17,7 +17,6 @@ USER_H = \
 	libzfs.h \
 	libzfsbootenv.h \
 	libzfs_core.h \
-	libzfs_impl.h \
 	libzutil.h \
 	thread_pool.h
 

diff --git a/lib/libshare/libshare.c b/lib/libshare/libshare.c
@@ -36,7 +36,6 @@
 #include <unistd.h>
 #include <libzfs.h>
 #include <libshare.h>
-#include "libzfs_impl.h"
 #include "libshare_impl.h"
 #include "nfs.h"
 #include "smb.h"

diff --git a/lib/libshare/os/freebsd/nfs.c b/lib/libshare/os/freebsd/nfs.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <libintl.h>
 
-#include "libzfs_impl.h"
+#include <libshare.h>
 #include "libshare_impl.h"
 #include "nfs.h"
 

diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
@@ -16,6 +16,7 @@ lib_LTLIBRARIES = libzfs.la
 include $(top_srcdir)/config/Abigail.am
 
 USER_C = \
+	libzfs_impl.h \
 	libzfs_changelist.c \
 	libzfs_config.c \
 	libzfs_crypto.c \

diff --git a/include/libzfs_impl.h → lib/libzfs/libzfs_impl.h b/include/libzfs_impl.h → lib/libzfs/libzfs_impl.h
diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <sys/vdev_impl.h>
 #include <libzfs.h>
-#include <libzfs_impl.h>
+#include "libzfs_impl.h"
 #include <libzutil.h>
 #include <sys/arc_impl.h>
 

diff --git a/lib/libzfs/os/freebsd/libzfs_compat.c b/lib/libzfs/os/freebsd/libzfs_compat.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2013 Martin Matuska <[email protected]>. All rights reserved.
  */
 #include <os/freebsd/zfs/sys/zfs_ioctl_compat.h>
-#include <libzfs_impl.h>
+#include "../../libzfs_impl.h"
 #include <libzfs.h>
 #include <libzutil.h>
 #include <sys/sysctl.h>

diff --git a/lib/libzfs/os/freebsd/libzfs_zmount.c b/lib/libzfs/os/freebsd/libzfs_zmount.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/errno.h>
 #include <libzfs.h>
 
-#include "libzfs_impl.h"
+#include "../../libzfs_impl.h"
 
 static void
 build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val,

diff --git a/lib/libzfs/os/linux/libzfs_mount_os.c b/lib/libzfs/os/linux/libzfs_mount_os.c
@@ -47,7 +47,7 @@
 #include <sys/dsl_crypt.h>
 #include <libzfs.h>
 
-#include "libzfs_impl.h"
+#include "../../libzfs_impl.h"
 #include <thread_pool.h>
 
 #define	ZS_COMMENT	0x00000000	/* comment */

diff --git a/lib/libzfs/os/linux/libzfs_pool_os.c b/lib/libzfs/os/linux/libzfs_pool_os.c
@@ -49,7 +49,7 @@
 
 #include "zfs_namecheck.h"
 #include "zfs_prop.h"
-#include "libzfs_impl.h"
+#include "../../libzfs_impl.h"
 #include "zfs_comutil.h"
 #include "zfeature_common.h"
 

diff --git a/lib/libzfs/os/linux/libzfs_sendrecv_os.c b/lib/libzfs/os/linux/libzfs_sendrecv_os.c
@@ -22,7 +22,7 @@
 
 #include <libzfs.h>
 
-#include "libzfs_impl.h"
+#include "../../libzfs_impl.h"
 
 #ifndef F_SETPIPE_SZ
 #define	F_SETPIPE_SZ (F_SETLEASE + 7)

diff --git a/lib/libzfs/os/linux/libzfs_util_os.c b/lib/libzfs/os/linux/libzfs_util_os.c
@@ -38,7 +38,7 @@
 #include <libzfs.h>
 #include <libzfs_core.h>
 
-#include "libzfs_impl.h"
+#include "../../libzfs_impl.h"
 #include "zfs_prop.h"
 #include <libzutil.h>
 #include <sys/zfs_sysfs.h>