diff options
| author | Ned Bass <[email protected]> | 2014-11-14 10:18:05 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-11-19 10:35:12 -0800 |
| commit | 52479ecf58fa89190e384edcf838fecccc786af5 (patch) | |
| tree | 6adb263086d8f7cc4ced0c81f217cb67dfb45d09 /module/spl/spl-generic.c | |
| parent | 8d9a23e82cea5d897e9357d569ef364106703d5a (diff) | |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #411
Diffstat (limited to 'module/spl/spl-generic.c')
| -rw-r--r-- | module/spl/spl-generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c index ecfb663de..803f03a85 100644 --- a/module/spl/spl-generic.c +++ b/module/spl/spl-generic.c @@ -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; |