LU-6401 uapi: migrate remaining uapi headers to uapi directory

[fs/lustre-release.git] / lustre / include / uapi / linux / lustre / lustre_ioctl.h

diff --git a/lustre/include/uapi/linux/lustre_ioctl.h b/lustre/include/uapi/linux/lustre/lustre_ioctl.h
similarity index 97%
rename from lustre/include/uapi/linux/lustre_ioctl.h
rename to lustre/include/uapi/linux/lustre/lustre_ioctl.h
index 2e8ee29..5469e29 100644 (file)
--- a/lustre/include/uapi/linux/lustre_ioctl.h
+++ b/lustre/include/uapi/linux/lustre/lustre_ioctl.h
@@ -31,7 +31,16 @@
 #include <linux/ioctl.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <lustre/lustre_idl.h>
+/*
+ * This is due to us being out of kernel and the way the OpenSFS branch
+ * handles CFLAGS.
+ */
+#ifdef __KERNEL__
+# include <uapi/linux/lustre/lustre_idl.h>
+#else
+# include <linux/lustre/lustre_idl.h>
+# define __user
+#endif
 
 #if !defined(__KERNEL__) && !defined(LUSTRE_UTILS)
 # error This file is for Lustre internal use only.
@@ -62,7 +71,6 @@ enum md_echo_cmd {
 
 #define OBD_IOCTL_VERSION      0x00010004
 #define OBD_DEV_BY_DEVNAME     0xffffd0de
-#define OBD_MAX_IOCTL_BUFFER   CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER
 
 struct obd_ioctl_data {
        __u32           ioc_len;