Rationalize include paths for the lustre uapi headers Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -35,7 +35,7 @@
#include <linux/errno.h>
#include <linux/kernel.h>
-#include "../../../uapi/linux/lustre/lustre_user.h"
+#include <uapi/linux/lustre/lustre_user.h>
/** \defgroup cfg cfg
*
@@ -37,7 +37,7 @@
#ifndef _UAPI_LUSTRE_FID_H_
#define _UAPI_LUSTRE_FID_H_
-#include "../../../uapi/linux/lustre/lustre_idl.h"
+#include <uapi/linux/lustre/lustre_idl.h>
/** returns fid object sequence */
static inline __u64 fid_seq(const struct lu_fid *fid)
@@ -70,10 +70,10 @@
#include <asm/byteorder.h>
#include <linux/types.h>
-#include "../lnet/lnet-types.h"
+#include <uapi/linux/lnet/lnet-types.h>
/* Defn's shared with user-space. */
-#include "lustre_user.h"
-#include "lustre_ver.h"
+#include <uapi/linux/lustre/lustre_ver.h>
/*
* GENERAL STUFF
@@ -31,7 +31,7 @@
#include <linux/ioctl.h>
#if !defined(__KERNEL__) && !defined(LUSTRE_UTILS)
# error This file is for Lustre internal use only.
#define _UAPI_LUSTRE_OSTID_H_
-#include "lustre_fid.h"
+#include <uapi/linux/lustre/lustre_fid.h>
static inline __u64 lmm_oi_id(const struct ost_id *oi)
{
@@ -55,7 +55,7 @@
# include <sys/quota.h>
# include <sys/stat.h>
#endif /* __KERNEL__ */
-#include "lustre_fiemap.h"
+#include <uapi/linux/lustre/lustre_fiemap.h>
* We need to always use 64bit version because the structure