]> git.proxmox.com Git - mirror_spl.git/commit
Remove compat includes from sys/types.h
authorNed Bass <bass6@llnl.gov>
Fri, 14 Nov 2014 18:18:05 +0000 (10:18 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 19 Nov 2014 18:35:12 +0000 (10:35 -0800)
commit52479ecf58fa89190e384edcf838fecccc786af5
tree6adb263086d8f7cc4ced0c81f217cb67dfb45d09
parent8d9a23e82cea5d897e9357d569ef364106703d5a
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
15 files changed:
include/linux/wait_compat.h
include/sys/types.h
module/spl/spl-generic.c
module/spl/spl-kmem.c
module/spl/spl-vnode.c
module/spl/spl-zlib.c
module/splat/splat-atomic.c
module/splat/splat-ctl.c
module/splat/splat-generic.c
module/splat/splat-linux.c
module/splat/splat-mutex.c
module/splat/splat-rwlock.c
module/splat/splat-taskq.c
module/splat/splat-thread.c
module/splat/splat-time.c