Explicitly include SPL compat headers

Inclusion of SPL compatibility headers was moved out of the public
header sys/types.h to avoid conflicts with external packages.  Include a
few compatiblity headers explicitly to cope with that change.  Also,
sort some linux-specific inclusions alphabetically.

Signed-off-by: Ned Bass <bass6@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2898

diff --git a/include/sys/zpl.h b/include/sys/zpl.h
index 2d82d1ada8316950e85e76a08c83e64cafc8d3ca..3fc5d979f76eb7d6427577bd6709ec86b145af6a 100644 (file)
--- a/include/sys/zpl.h
+++ b/include/sys/zpl.h
@@ -26,14 +26,15 @@
 #define        _SYS_ZPL_H
 
 #include <sys/vfs.h>
-#include <linux/vfs_compat.h>
-#include <linux/xattr_compat.h>
+#include <linux/aio.h>
 #include <linux/dcache_compat.h>
 #include <linux/exportfs.h>
-#include <linux/writeback.h>
 #include <linux/falloc.h>
+#include <linux/file_compat.h>
 #include <linux/task_io_accounting_ops.h>
-#include <linux/aio.h>
+#include <linux/vfs_compat.h>
+#include <linux/writeback.h>
+#include <linux/xattr_compat.h>
 
 /* zpl_inode.c */
 extern void zpl_vap_init(vattr_t *vap, struct inode *dir,

diff --git a/module/avl/avl.c b/module/avl/avl.c
index b598cc918828dd76755d31f122329464cf6902b0..5c2b722e669eb3ef7fc6ba590d0fcf5a42d3fd62 100644 (file)
--- a/module/avl/avl.c
+++ b/module/avl/avl.c
@@ -1030,6 +1030,7 @@ done:
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
+#include <linux/module_compat.h>
 
 static int avl_init(void) { return 0; }
 static int avl_fini(void) { return 0; }

diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c
index f5c31663a70ccfcfd31a5b6ba739ff7d4460ee49..9fd486bca75ec88a8e12492667a7d175ea232141 100644 (file)
--- a/module/nvpair/nvpair.c
+++ b/module/nvpair/nvpair.c
@@ -3293,6 +3293,7 @@ nvs_xdr(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen)
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
+#include <linux/module_compat.h>
 
 static int nvpair_init(void) { return 0; }
 static int nvpair_fini(void) { return 0; }

diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c
index 60e586d25fe760631d19a6ef9aa2fb478e68e7c8..f5ab7795169d980574d383c2707654e6d528a576 100644 (file)
--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@@ -2133,6 +2133,7 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
+#include <linux/module_compat.h>
 
 static int unicode_init(void) { return 0; }
 static int unicode_fini(void) { return 0; }

diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
index e60c4f7d426c40a419ec68af4f1a956cab4ab6ec..18b5f951ee825043102b68f15b6483af298afa00 100644 (file)
--- a/module/zcommon/zfs_prop.c
+++ b/module/zcommon/zfs_prop.c
@@ -678,6 +678,7 @@ zfs_prop_align_right(zfs_prop_t prop)
 #endif
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
+#include <linux/module_compat.h>
 
 static int zcommon_init(void) { return 0; }
 static int zcommon_fini(void) { return 0; }

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index fd593a13e8ef7152a175b5c839505e92f8f92daf..5b90d9a9f7a3b26012f62adb9ea6ae3e85c42d99 100644 (file)
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -140,6 +140,7 @@
 #include <vm/anon.h>
 #include <sys/fs/swapnode.h>
 #include <sys/zpl.h>
+#include <linux/mm_compat.h>
 #endif
 #include <sys/callb.h>
 #include <sys/kstat.h>

diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 9396d6caa9ba3f8acd77a51c9ed98a4c821074f0..5fb407900adf7fda3b0999aed60ff79b350fcdc5 100644 (file)
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -186,6 +186,7 @@
 #include <sys/zfeature.h>
 
 #include <linux/miscdevice.h>
+#include <linux/module_compat.h>
 
 #include "zfs_namecheck.h"
 #include "zfs_prop.h"

diff --git a/module/zpios/pios.c b/module/zpios/pios.c
index 860edea7bbd85300dcab13dc8e896a776c5fb5b3..fb15046bee4be81e34b857dfb44d7a2e8efae94c 100644 (file)
--- a/module/zpios/pios.c
+++ b/module/zpios/pios.c
@@ -36,6 +36,7 @@
 #include <sys/txg.h>
 #include <sys/dsl_destroy.h>
 #include <linux/miscdevice.h>
+#include <linux/module_compat.h>
 #include "zpios-internal.h"