libshare: fold into libzfs and reorg headers a little

libzfs is the only user of libshare, and only internally, so there's no
particular reason to build it separately, nor to export its symbols. So,
pull it into libzfs proper, remove its "public" header, and hide its
symbols.

The bare minimum "public" API is just to count and enumerate the
supported share types. These are moved to libzfs.h with the other share
API.

Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #18072

Author: robn

cmd/zfs/zfs_main.c

@@ -7339,15 +7339,14 @@ append_options(char *mntopts, char *newopts)
 static enum sa_protocol
 sa_protocol_decode(const char *protocol)
 {
-	for (enum sa_protocol i = 0; i < ARRAY_SIZE(sa_protocol_names); ++i)
-		if (strcmp(protocol, sa_protocol_names[i]) == 0)
+	for (enum sa_protocol i = 0; i < SA_PROTOCOL_COUNT; ++i)
+		if (strcmp(protocol, zfs_share_protocol_name(i)) == 0)
 			return (i);
 
 	(void) fputs(gettext("share type must be one of: "), stderr);
-	for (enum sa_protocol i = 0;
-	    i < ARRAY_SIZE(sa_protocol_names); ++i)
+	for (enum sa_protocol i = 0; i < SA_PROTOCOL_COUNT; ++i)
 		(void) fprintf(stderr, "%s%s",
-		    i != 0 ? ", " : "", sa_protocol_names[i]);
+		    i != 0 ? ", " : "", zfs_share_protocol_name(i));
 	(void) fputc('\n', stderr);
 	usage(B_FALSE);
 }

include/libzfs.h

@@ -37,7 +37,6 @@
 #define	_LIBZFS_H extern __attribute__((visibility("default")))
 
 #include <assert.h>
-#include <libshare.h>
 #include <libnvpair.h>
 #include <sys/mnttab.h>
 #include <sys/param.h>
@@ -983,6 +982,15 @@ _LIBZFS_H void zfs_adjust_mount_options(zfs_handle_t *zhp, const char *mntpoint,
  */
 #define	SA_NO_PROTOCOL -1
 
+/* available protocols */
+enum sa_protocol {
+	SA_PROTOCOL_NFS,
+	SA_PROTOCOL_SMB, /* ABI: add before _COUNT */
+	SA_PROTOCOL_COUNT,
+};
+
+_LIBZFS_H const char *zfs_share_protocol_name(enum sa_protocol);
+
 _LIBZFS_H boolean_t zfs_is_shared(zfs_handle_t *zhp, char **where,
     const enum sa_protocol *proto);
 _LIBZFS_H int zfs_share(zfs_handle_t *zhp, const enum sa_protocol *proto);

lib/Makefile.am

@@ -16,12 +16,12 @@
 #                |--libzdb--zdb             |                    |
 #                |                          |                    |
 #             libzpool                   libzfs* ----------------+
-#             | | |  \                  / | | |\
-#    libicp --/ | |   \                /  | \ | \----- libshare
-#               | |    \              /   |  \ \
-#    libzstd ---/ |     \            /    |   \ \-------\
-#                 |      \          /     \    \         \
-#    libunicode --/       \        /       \    \-------\ \
+#             | |    \                  / | | |
+#    libicp --/ |     \                /  | \ |
+#               |      \              /   |  \ \
+#    libzstd ---/       \            /    |   \ \-------\
+#                        \          /     \    \         \
+#                         \        /       \    \-------\ \
 #                          \      /         \            \ |
 #                          libzutil        libzfs_core*  | |
 #                            | | | \          |     |    | |
@@ -56,7 +56,6 @@ pkgconfig_DATA =
 include $(srcdir)/%D%/libavl/Makefile.am
 include $(srcdir)/%D%/libicp/Makefile.am
 include $(srcdir)/%D%/libnvpair/Makefile.am
-include $(srcdir)/%D%/libshare/Makefile.am
 include $(srcdir)/%D%/libspl/Makefile.am
 include $(srcdir)/%D%/libunicode/Makefile.am
 include $(srcdir)/%D%/libzdb/Makefile.am

lib/libshare/Makefile.am

@@ -3,7 +3,6 @@ libspl_HEADERS = \
 	%D%/assert.h \
 	%D%/atomic.h \
 	%D%/libgen.h \
-	%D%/libshare.h \
 	%D%/libspl.h \
 	%D%/statcommon.h \
 	%D%/stdlib.h \

lib/libshare/libshare_impl.h

@@ -7,6 +7,7 @@ CPPCHECKTARGETS += libzfs.la
 
 dist_libzfs_la_SOURCES = \
 	%D%/libzfs_impl.h \
+	%D%/libzfs_share.h \
 	%D%/libzfs_changelist.c \
 	%D%/libzfs_config.c \
 	%D%/libzfs_crypto.c \
@@ -16,20 +17,26 @@ dist_libzfs_la_SOURCES = \
 	%D%/libzfs_iter.c \
 	%D%/libzfs_mount.c \
 	%D%/libzfs_pool.c \
+	%D%/libzfs_share.c \
+	%D%/libzfs_share_nfs.c \
 	%D%/libzfs_sendrecv.c \
 	%D%/libzfs_status.c \
 	%D%/libzfs_util.c
 
 if BUILD_FREEBSD
 dist_libzfs_la_SOURCES += \
 	%D%/os/freebsd/libzfs_compat.c \
+	%D%/os/freebsd/libzfs_share_nfs.c \
+	%D%/os/freebsd/libzfs_share_smb.c \
 	%D%/os/freebsd/libzfs_zmount.c
 endif
 
 if BUILD_LINUX
 dist_libzfs_la_SOURCES += \
 	%D%/os/linux/libzfs_mount_os.c \
 	%D%/os/linux/libzfs_pool_os.c \
+	%D%/os/linux/libzfs_share_nfs.c \
+	%D%/os/linux/libzfs_share_smb.c \
 	%D%/os/linux/libzfs_util_os.c
 endif
 
@@ -52,7 +59,6 @@ nodist_libzfs_la_SOURCES = \
 	module/zcommon/zprop_common.c
 
 libzfs_la_LIBADD = \
-	libshare.la \
 	libzfs_core.la \
 	libnvpair.la \
 	libzutil.la