libspl/include: remove unused/empty headers

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes openzfs#13447
andrewc12 · Sep 23, 2022 · 35b6b2b · 35b6b2b
1 parent 01c7b63
commit 35b6b2b
Show file tree

Hide file tree

Showing 24 changed files with 6 additions and 604 deletions.
diff --git a/include/libzfs.h b/include/libzfs.h
@@ -40,10 +40,8 @@
 #include <sys/mnttab.h>
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/varargs.h>
 #include <sys/fs/zfs.h>
 #include <sys/avl.h>
-#include <ucred.h>
 #include <libzfs_core.h>
 
 #ifdef	__cplusplus

diff --git a/include/thread_pool.h b/include/thread_pool.h
@@ -28,7 +28,6 @@
 #define	_THREAD_POOL_H_ extern __attribute__((visibility("default")))
 
 #include <sys/types.h>
-#include <thread.h>
 #include <pthread.h>
 
 #ifdef	__cplusplus

diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am
@@ -2,18 +2,11 @@ libspldir = $(includedir)/libspl
 libspl_HEADERS = \
 	%D%/assert.h \
 	%D%/atomic.h \
-	%D%/libdevinfo.h \
 	%D%/libgen.h \
 	%D%/libshare.h \
-	%D%/limits.h \
-	%D%/locale.h \
 	%D%/statcommon.h \
 	%D%/stdlib.h \
 	%D%/string.h \
-	%D%/stropts.h \
-	%D%/thread.h \
-	%D%/tzfile.h \
-	%D%/ucred.h \
 	%D%/umem.h \
 	%D%/unistd.h \
 	%D%/zone.h
@@ -40,8 +33,6 @@ libspl_sys_HEADERS = \
 	%D%/sys/dkio.h \
 	%D%/sys/dklabel.h \
 	%D%/sys/feature_tests.h \
-	%D%/sys/int_limits.h \
-	%D%/sys/int_types.h \
 	%D%/sys/inttypes.h \
 	%D%/sys/isa_defs.h \
 	%D%/sys/kmem.h \
@@ -59,18 +50,14 @@ libspl_sys_HEADERS = \
 	%D%/sys/stack.h \
 	%D%/sys/stdtypes.h \
 	%D%/sys/string.h \
-	%D%/sys/stropts.h \
 	%D%/sys/sunddi.h \
 	%D%/sys/systeminfo.h \
 	%D%/sys/time.h \
 	%D%/sys/trace_spl.h \
 	%D%/sys/trace_zfs.h \
 	%D%/sys/types.h \
 	%D%/sys/types32.h \
-	%D%/sys/tzfile.h \
 	%D%/sys/uio.h \
-	%D%/sys/va_list.h \
-	%D%/sys/varargs.h \
 	%D%/sys/vnode.h \
 	%D%/sys/wmsum.h \
 	%D%/sys/zone.h

diff --git a/lib/libspl/include/libdevinfo.h b/lib/libspl/include/libdevinfo.h
diff --git a/lib/libspl/include/limits.h b/lib/libspl/include/limits.h
diff --git a/lib/libspl/include/locale.h b/lib/libspl/include/locale.h
diff --git a/lib/libspl/include/os/freebsd/sys/byteorder.h b/lib/libspl/include/os/freebsd/sys/byteorder.h
@@ -43,7 +43,7 @@
 #include <sys/endian.h>
 #include <netinet/in.h>
 #include <sys/isa_defs.h>
-#include <sys/int_types.h>
+#include <inttypes.h>
 
 #if defined(__GNUC__) && defined(_ASM_INLINES) && \
 	(defined(__i386) || defined(__amd64))

diff --git a/lib/libspl/include/os/freebsd/sys/mnttab.h b/lib/libspl/include/os/freebsd/sys/mnttab.h
@@ -79,7 +79,7 @@ extern int _sol_getmntent(FILE *fp, struct mnttab *mp);
 extern int getextmntent(const char *path, struct extmnttab *entry,
     struct stat64 *statbuf);
 extern void statfs2mnttab(struct statfs *sfs, struct mnttab *mp);
-char *hasmntopt(struct mnttab *mnt, char *opt);
-int getmntent(FILE *fp, struct mnttab *mp);
+extern char *hasmntopt(struct mnttab *mnt, char *opt);
+extern int getmntent(FILE *fp, struct mnttab *mp);
 
 #endif
diff --git a/lib/libspl/include/os/freebsd/sys/zfs_context_os.h b/lib/libspl/include/os/freebsd/sys/zfs_context_os.h
@@ -30,6 +30,5 @@
 #define	ZFS_CONTEXT_OS_H_
 
 #define	HAVE_LARGE_STACKS	1
-#define	ZFS_EXPORTS_PATH	"/etc/zfs/exports"
 
 #endif
diff --git a/lib/libspl/include/os/linux/sys/byteorder.h b/lib/libspl/include/os/linux/sys/byteorder.h
@@ -46,7 +46,7 @@
 #endif
 
 #include <sys/isa_defs.h>
-#include <sys/int_types.h>
+#include <inttypes.h>
 
 #ifdef	__cplusplus
 extern "C" {

diff --git a/lib/libspl/include/stropts.h b/lib/libspl/include/stropts.h
diff --git a/lib/libspl/include/sys/int_limits.h b/lib/libspl/include/sys/int_limits.h
diff --git a/lib/libspl/include/sys/int_types.h b/lib/libspl/include/sys/int_types.h
diff --git a/lib/libspl/include/sys/kstat.h b/lib/libspl/include/sys/kstat.h
@@ -92,39 +92,6 @@ typedef struct kstat {
 	void		*ks_lock;	/* protects this kstat's data */
 } kstat_t;
 
-#ifdef _SYSCALL32
-
-typedef int32_t kid32_t;
-
-typedef struct kstat32 {
-	/*
-	 * Fields relevant to both kernel and user
-	 */
-	hrtime_t	ks_crtime;
-	caddr32_t	ks_next;		/* struct kstat pointer */
-	kid32_t		ks_kid;
-	char		ks_module[KSTAT_STRLEN];
-	uint8_t		ks_resv;
-	int32_t		ks_instance;
-	char		ks_name[KSTAT_STRLEN];
-	uint8_t		ks_type;
-	char		ks_class[KSTAT_STRLEN];
-	uint8_t		ks_flags;
-	caddr32_t	ks_data;		/* type-specific data */
-	uint32_t	ks_ndata;
-	size32_t	ks_data_size;
-	hrtime_t	ks_snaptime;
-	/*
-	 * Fields relevant to kernel only (only needed here for padding)
-	 */
-	int32_t		_ks_update;
-	caddr32_t	_ks_private;
-	int32_t		_ks_snapshot;
-	caddr32_t	_ks_lock;
-} kstat32_t;
-
-#endif	/* _SYSCALL32 */
-
 /*
  * kstat structure and locking strategy
  *
@@ -467,7 +434,7 @@ typedef struct kstat_named {
  * 64-bit compilation environments or 32-bit non-maximally conformant
  * C89 or C90 ANSI C compilation environments (cc -Xt and cc -Xa). In the
  * C99 ANSI C compilation environment, the long long type is supported.
- * The _INT64_TYPE is defined by the implementation (see sys/int_types.h).
+ * The _INT64_TYPE is defined by the implementation (see sys/inttypes.h).
  */
 #if defined(_INT64_TYPE)
 		int64_t		i64;

diff --git a/lib/libspl/include/sys/stropts.h b/lib/libspl/include/sys/stropts.h
diff --git a/lib/libspl/include/sys/types.h b/lib/libspl/include/sys/types.h
@@ -37,7 +37,7 @@
 #include <sys/feature_tests.h>
 #include_next <sys/types.h>
 #include <sys/types32.h>
-#include <sys/va_list.h>
+#include <stdarg.h>
 #include <sys/stdtypes.h>
 
 #ifndef HAVE_INTTYPES