Remove compat includes from sys/types.h

Don't include the compatibility code in linux/*_compat.h in the public
header sys/types.h. This causes problems when an external code base
includes the ZFS headers and has its own conflicting compatibility code.
Lustre, in particular, defined SHRINK_STOP for compatibility with
pre-3.12 kernels in a way that conflicted with the SPL's definition.
Because Lustre ZFS OSD includes ZFS headers it fails to build due to a
'"SHRINK_STOP" redefined' compiler warning.  To avoid such conflicts
only include the compat headers from .c files or private headers.

Also, for consistency, include sys/*.h before linux/*.h then sort by
header name.

Signed-off-by: Ned Bass <bass6@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #411
This commit is contained in:
Ned Bass
2014-11-14 10:18:05 -08:00
committed by Brian Behlendorf
parent 8d9a23e82c
commit 52479ecf58
15 changed files with 29 additions and 23 deletions
+1
View File
@@ -39,6 +39,7 @@
#include <sys/kstat.h>
#include <sys/file.h>
#include <linux/kmod.h>
#include <linux/math64_compat.h>
#include <linux/proc_compat.h>
char spl_version[32] = "SPL v" SPL_META_VERSION "-" SPL_META_RELEASE;
+2
View File
@@ -25,6 +25,8 @@
\*****************************************************************************/
#include <sys/kmem.h>
#include <linux/mm_compat.h>
#include <linux/wait_compat.h>
/*
* Within the scope of spl-kmem.c file the kmem_cache_* definitions
+1
View File
@@ -27,6 +27,7 @@
#include <sys/cred.h>
#include <sys/vnode.h>
#include <linux/falloc.h>
#include <linux/file_compat.h>
vnode_t *rootdir = (vnode_t *)0xabcd1234;
EXPORT_SYMBOL(rootdir);
+1
View File
@@ -55,6 +55,7 @@
#include <sys/kmem.h>
#include <sys/zmod.h>
#include <linux/zlib_compat.h>
static spl_kmem_cache_t *zlib_workspace_cache;