c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove compat includes from sys/types.h

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
include/sys/types.h
-12
View File
@@ -28,18 +28,6 @@
#include <linux/types.h>
#include <sys/sysmacros.h>
#include <linux/file_compat.h>
#include <linux/list_compat.h>
#include <linux/bitops_compat.h>
#include <linux/module_compat.h>
#include <linux/proc_compat.h>
#include <linux/math64_compat.h>
#include <linux/zlib_compat.h>
#include <linux/mm_compat.h>
#include <linux/delay.h>
#include <linux/wait_compat.h>
#include <linux/uaccess.h>
#ifndef ULLONG_MAX
#define ULLONG_MAX (~0ULL)
#endif