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

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

diff --git a/lustre/include/uapi/linux/lustre_cfg.h b/lustre/include/uapi/linux/lustre/lustre_cfg.h
similarity index 97%
rename from lustre/include/uapi/linux/lustre_cfg.h
rename to lustre/include/uapi/linux/lustre/lustre_cfg.h
index b1f68d5..c71be81 100644 (file)
--- a/lustre/include/uapi/linux/lustre_cfg.h
+++ b/lustre/include/uapi/linux/lustre/lustre_cfg.h
@@ -33,8 +33,17 @@
 #ifndef _UAPI_LUSTRE_CFG_H
 #define _UAPI_LUSTRE_CFG_H
 
+#include <linux/errno.h>
 #include <linux/kernel.h>
-#include <lustre/lustre_user.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_user.h>
+#else
+# include <linux/lustre/lustre_user.h>
+#endif
 
 /* Handle older distros */
 #ifndef __ALIGN_KERNEL