LU-15971 llite: implicit default LMV inherit

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

diff --git a/lustre/include/uapi/linux/lustre/lustre_barrier_user.h b/lustre/include/uapi/linux/lustre/lustre_barrier_user.h
index 482e87f..3808424 100644 (file)
--- a/lustre/include/uapi/linux/lustre/lustre_barrier_user.h
+++ b/lustre/include/uapi/linux/lustre/lustre_barrier_user.h
@@ -31,15 +31,8 @@
 #ifndef _LUSTRE_BARRIER_USER_H
 # define _LUSTRE_BARRIER_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
+#include <linux/types.h>
+#include <linux/lustre/lustre_user.h>
 
 #define BARRIER_VERSION_V1     1
 #define BARRIER_TIMEOUT_DEFAULT        30