Move platform dependent errno aliases

EBADE, EBADR, and ENOANO do not exist on FreeBSD

The libspl errno.h is similarly platform dependent.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #9498

diff --git a/include/os/linux/spl/sys/errno.h b/include/os/linux/spl/sys/errno.h
index 6015b1a3e2f17f7eaff3686865eb83a12928a201..f6d9212a613fc08ae714e8ff0cdd949cf7df8ff1 100644 (file)
--- a/include/os/linux/spl/sys/errno.h
+++ b/include/os/linux/spl/sys/errno.h
@@ -44,4 +44,14 @@
 
 #define        ENOTSUP         EOPNOTSUPP
 
+/*
+ * We'll take the unused errnos, 'EBADE' and 'EBADR' (from the Convergent
+ * graveyard) to indicate checksum errors and fragmentation.
+ */
+#define        ECKSUM  EBADE
+#define        EFRAGS  EBADR
+
+/* Similar for ENOACTIVE */
+#define        ENOTACTIVE      ENOANO
+
 #endif /* _SYS_ERRNO_H */

diff --git a/include/sys/zio.h b/include/sys/zio.h
index bf441ff8d5112838581dfd14d95ee67168534214..23a4a6ea93ccd069b680ccc8b46985c486627f6b 100644 (file)
--- a/include/sys/zio.h
+++ b/include/sys/zio.h
@@ -265,16 +265,6 @@ enum zio_wait_type {
        ZIO_WAIT_TYPES
 };
 
-/*
- * We'll take the unused errnos, 'EBADE' and 'EBADR' (from the Convergent
- * graveyard) to indicate checksum errors and fragmentation.
- */
-#define        ECKSUM  EBADE
-#define        EFRAGS  EBADR
-
-/* Similar for ENOACTIVE */
-#define        ENOTACTIVE      ENOANO
-
 typedef void zio_done_func_t(zio_t *zio);
 
 extern int zio_dva_throttle_enabled;

diff --git a/lib/libspl/include/os/linux/sys/Makefile.am b/lib/libspl/include/os/linux/sys/Makefile.am
index c11732cc1f5853ae6698a3c5c72f82d1067af1fe..6b170fa8c8466219e6caef3c4041dd9cee2606e0 100644 (file)
--- a/lib/libspl/include/os/linux/sys/Makefile.am
+++ b/lib/libspl/include/os/linux/sys/Makefile.am
@@ -1,6 +1,7 @@
 libspldir = $(includedir)/libspl/sys
 libspl_HEADERS = \
        $(top_srcdir)/lib/libspl/include/os/linux/sys/byteorder.h \
+       $(top_srcdir)/lib/libspl/include/os/linux/sys/errno.h \
        $(top_srcdir)/lib/libspl/include/os/linux/sys/file.h \
        $(top_srcdir)/lib/libspl/include/os/linux/sys/mnttab.h \
        $(top_srcdir)/lib/libspl/include/os/linux/sys/mount.h \

diff --git a/lib/libspl/include/sys/errno.h b/lib/libspl/include/os/linux/sys/errno.h
similarity index 84%
rename from lib/libspl/include/sys/errno.h
rename to lib/libspl/include/os/linux/sys/errno.h
index e8bfbe353842fd3aee653fa17ac00e428a67f214..30d20ab895c512632803282c5fe4d65f1edb25c7 100644 (file)
--- a/lib/libspl/include/sys/errno.h
+++ b/lib/libspl/include/os/linux/sys/errno.h
@@ -31,5 +31,16 @@
  */
 #ifndef _LIBSPL_SYS_ERRNO_H
 #define        _LIBSPL_SYS_ERRNO_H
+
 #include <errno.h>
+/*
+ * We'll take the unused errnos, 'EBADE' and 'EBADR' (from the Convergent
+ * graveyard) to indicate checksum errors and fragmentation.
+ */
+#define        ECKSUM  EBADE
+#define        EFRAGS  EBADR
+
+/* Similar for ENOACTIVE */
+#define        ENOTACTIVE      ENOANO
+
 #endif /* _LIBSPL_SYS_ERRNO_H */

diff --git a/lib/libspl/include/sys/Makefile.am b/lib/libspl/include/sys/Makefile.am
index 54aece1299f6dfa4cba40fc9811365217dc7286a..6855a39d123b3cc1045a7426fc3b9dda83b84606 100644 (file)
--- a/lib/libspl/include/sys/Makefile.am
+++ b/lib/libspl/include/sys/Makefile.am
@@ -11,7 +11,6 @@ libspl_HEADERS = \
        $(top_srcdir)/lib/libspl/include/sys/debug.h \
        $(top_srcdir)/lib/libspl/include/sys/dkio.h \
        $(top_srcdir)/lib/libspl/include/sys/dklabel.h \
-       $(top_srcdir)/lib/libspl/include/sys/errno.h \
        $(top_srcdir)/lib/libspl/include/sys/feature_tests.h \
        $(top_srcdir)/lib/libspl/include/sys/int_limits.h \
        $(top_srcdir)/lib/libspl/include/sys/int_types.h \