* GPL HEADER END
*/
/*
- * Copyright (c) 2016, Intel Corporation.
+ * Copyright (c) 2017, Intel Corporation.
*
* lustre/include/lustre/lustre_barrier_user.h
*
#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