c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-23 02:44:41 +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/linux/wait_compat.h
+1
View File
@@ -25,6 +25,7 @@
#ifndef _SPL_WAIT_COMPAT_H
#define _SPL_WAIT_COMPAT_H
#include <linux/sched.h>
#ifndef HAVE_WAIT_ON_BIT_ACTION
# define spl_wait_on_bit(word, bit, mode) wait_on_bit(word, bit, mode)