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

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

diff --git a/lustre/include/lustre_log_user.h b/lustre/include/uapi/linux/lustre/lustre_log_user.h
similarity index 91%
rename from lustre/include/lustre_log_user.h
rename to lustre/include/uapi/linux/lustre/lustre_log_user.h
index ee5f0f7..1191c74 100644 (file)
--- a/lustre/include/lustre_log_user.h
+++ b/lustre/include/uapi/linux/lustre/lustre_log_user.h
@@ -38,7 +38,15 @@
 #ifndef _LUSTRE_LOG_USER_H
 #define _LUSTRE_LOG_USER_H
 
-#include <uapi/linux/lustre_fid.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_fid.h>
+#else
+#include <linux/lustre/lustre_fid.h>
+#endif
 
 /*  Lustre logs use FIDs constructed from oi_id and oi_seq directly,
  *  without attempting to use the IGIF and IDIF ranges as is done