LU-13274 uapi: make lustre UAPI headers C99 compliant

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

diff --git a/lustre/include/uapi/linux/lustre/lustre_ostid.h b/lustre/include/uapi/linux/lustre/lustre_ostid.h
index 4a96640..90fa213 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_ostid.h
+++ b/lustre/include/uapi/linux/lustre/lustre_ostid.h
@@ -36,15 +36,7 @@
 
 #include <linux/errno.h>
 #include <linux/types.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
 
 static inline __u64 lmm_oi_id(const struct ost_id *oi)
 {