diff options
| author | James Simmons <jsimmons@infradead.org> | 2017-08-19 22:26:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-22 18:36:52 -0700 |
| commit | 8d4fafa6ae1492d2882b4b43c9025262ceb87bc2 (patch) | |
| tree | 2108c574d86eb884703e419c3e16ae1f7f669e6b /drivers | |
| parent | 8c355a7a33a8293d864cb086c5b1236e2e463eb0 (diff) | |
staging: lustre: lustre: cleanup paths for lustre UAPI headers
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>
Diffstat (limited to 'drivers')
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h index 2b7deaa1e0a9..11b51d93f64c 100644 --- a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h +++ b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h @@ -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 * diff --git a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_fid.h b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_fid.h index dd3785adb8ea..2e7a8d103777 100644 --- a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_fid.h +++ b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_fid.h @@ -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) diff --git a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_idl.h b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_idl.h index cc59c1a44b23..aac98dbcf6e3 100644 --- a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_idl.h +++ b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_idl.h @@ -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_user.h> +#include <uapi/linux/lustre/lustre_ver.h> /* * GENERAL STUFF diff --git a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h index 1f52477667f2..9590864e0b50 100644 --- a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h +++ b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h @@ -31,7 +31,7 @@ #include <linux/ioctl.h> #include <linux/kernel.h> #include <linux/types.h> -#include "../../../uapi/linux/lustre/lustre_idl.h" +#include <uapi/linux/lustre/lustre_idl.h> #if !defined(__KERNEL__) && !defined(LUSTRE_UTILS) # error This file is for Lustre internal use only. diff --git a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ostid.h b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ostid.h index 9110229b0886..3343b602219b 100644 --- a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ostid.h +++ b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_ostid.h @@ -35,7 +35,7 @@ #define _UAPI_LUSTRE_OSTID_H_ #include <linux/errno.h> -#include "lustre_fid.h" +#include <uapi/linux/lustre/lustre_fid.h> static inline __u64 lmm_oi_id(const struct ost_id *oi) { diff --git a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_user.h b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_user.h index 2fcfe2b2d365..5e332e3af68a 100644 --- a/drivers/staging/lustre/include/uapi/linux/lustre/lustre_user.h +++ b/drivers/staging/lustre/include/uapi/linux/lustre/lustre_user.h @@ -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 |