From eefaa55f6452dcaeb26a8994ecf6aa8af054ab83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Sat, 15 May 2021 13:00:05 +0200
Subject: [PATCH] libzfs: don't distribute libzfs_impl.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12048
---
 include/Makefile.am                      | 1 -
 lib/libshare/libshare.c                  | 1 -
 lib/libshare/os/freebsd/nfs.c            | 2 +-
 lib/libzfs/Makefile.am                   | 1 +
 {include => lib/libzfs}/libzfs_impl.h    | 0
 lib/libzfs/libzfs_import.c               | 2 +-
 lib/libzfs/os/freebsd/libzfs_compat.c    | 2 +-
 lib/libzfs/os/freebsd/libzfs_zmount.c    | 2 +-
 lib/libzfs/os/linux/libzfs_mount_os.c    | 2 +-
 lib/libzfs/os/linux/libzfs_pool_os.c     | 2 +-
 lib/libzfs/os/linux/libzfs_sendrecv_os.c | 2 +-
 lib/libzfs/os/linux/libzfs_util_os.c     | 2 +-
 12 files changed, 9 insertions(+), 10 deletions(-)
 rename {include => lib/libzfs}/libzfs_impl.h (100%)

diff --git a/include/Makefile.am b/include/Makefile.am
index 17286ecbb7fd..4da43afd850d 100644
--- 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
index d32a282a36e3..a228645fbf8f 100644
--- 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
index 323c9269f188..b82491f2ebe8 100644
--- 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
index 31267fd9a5e9..9385eb1aadbb 100644
--- 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 b/lib/libzfs/libzfs_impl.h
similarity index 100%
rename from include/libzfs_impl.h
rename to lib/libzfs/libzfs_impl.h
diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
index 64fa31c67d0f..0d375b355166 100644
--- 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
index 3c5f684c6889..4d7421df8d3b 100644
--- 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 <mm@FreeBSD.org>. 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
index 699d330ebdb4..e1febe6a2d91 100644
--- 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
index 21d64053862e..547895d7e370 100644
--- 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
index 747b5652f7c0..90eb8db50790 100644
--- 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
index ac7ab95a39b6..593c38ec62df 100644
--- 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
index e2482c57135a..b116f92d97af 100644
--- 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>