summaryrefslogtreecommitdiffstats
path: root/include/sys/zpl.h
diff options
context:
space:
mode:
authorNed Bass <[email protected]>2014-11-14 10:21:53 -0800
committerBrian Behlendorf <[email protected]>2014-11-19 12:30:39 -0500
commitaaed7c408c0bd72c6f9437793a98542972f0a8fd (patch)
tree1880a1f7d7c72e7e1ec041bd31dca9e44bbe287c /include/sys/zpl.h
parent7b2d78a046aa4695d434478a439a9438521d73af (diff)
Explicitly include SPL compat headers
Inclusion of SPL compatibility headers was moved out of the public header sys/types.h to avoid conflicts with external packages. Include a few compatiblity headers explicitly to cope with that change. Also, sort some linux-specific inclusions alphabetically. Signed-off-by: Ned Bass <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #2898
Diffstat (limited to 'include/sys/zpl.h')
-rw-r--r--include/sys/zpl.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/sys/zpl.h b/include/sys/zpl.h
index 2d82d1ada..3fc5d979f 100644
--- a/include/sys/zpl.h
+++ b/include/sys/zpl.h
@@ -26,14 +26,15 @@
#define _SYS_ZPL_H
#include <sys/vfs.h>
-#include <linux/vfs_compat.h>
-#include <linux/xattr_compat.h>
+#include <linux/aio.h>
#include <linux/dcache_compat.h>
#include <linux/exportfs.h>
-#include <linux/writeback.h>
#include <linux/falloc.h>
+#include <linux/file_compat.h>
#include <linux/task_io_accounting_ops.h>
-#include <linux/aio.h>
+#include <linux/vfs_compat.h>
+#include <linux/writeback.h>
+#include <linux/xattr_compat.h>
/* zpl_inode.c */
extern void zpl_vap_init(vattr_t *vap, struct inode *dir,