diff options
author | James Simmons <jsimmons@infradead.org> | 2017-08-19 22:26:40 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-22 18:36:51 -0700 |
commit | b2a0f9e071b8efa3aabfd936526852237a7e99bf (patch) | |
tree | db9cf7ebfef1a08ca592847f97e8946a7b9171f8 | |
parent | staging: lustre: fid: add include path to Makefile (diff) | |
download | linux-dev-b2a0f9e071b8efa3aabfd936526852237a7e99bf.tar.xz linux-dev-b2a0f9e071b8efa3aabfd936526852237a7e99bf.zip |
staging: lustre: fld: add include path to Makefile
Rationalize include paths in the fld source code files.
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/lustre/lustre/fld/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/fld/fld_cache.c | 16 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/fld/fld_internal.h | 8 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/fld/fld_request.c | 18 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/fld/lproc_fld.c | 14 |
5 files changed, 31 insertions, 28 deletions
diff --git a/drivers/staging/lustre/lustre/fld/Makefile b/drivers/staging/lustre/lustre/fld/Makefile index 646e315d1aa8..426deba8b815 100644 --- a/drivers/staging/lustre/lustre/fld/Makefile +++ b/drivers/staging/lustre/lustre/fld/Makefile @@ -1,2 +1,5 @@ +subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include +subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include/ + obj-$(CONFIG_LUSTRE_FS) += fld.o fld-y := fld_request.o fld_cache.o lproc_fld.o diff --git a/drivers/staging/lustre/lustre/fld/fld_cache.c b/drivers/staging/lustre/lustre/fld/fld_cache.c index 68d009b83733..b723ece02eff 100644 --- a/drivers/staging/lustre/lustre/fld/fld_cache.c +++ b/drivers/staging/lustre/lustre/fld/fld_cache.c @@ -39,18 +39,18 @@ #define DEBUG_SUBSYSTEM S_FLD -#include "../../include/linux/libcfs/libcfs.h" +#include <linux/libcfs/libcfs.h> #include <linux/module.h> #include <asm/div64.h> -#include "../include/obd.h" -#include "../include/obd_class.h" -#include "../../include/uapi/linux/lustre/lustre_ver.h" -#include "../include/obd_support.h" -#include "../include/lprocfs_status.h" +#include <obd.h> +#include <obd_class.h> +#include <uapi/linux/lustre/lustre_ver.h> +#include <obd_support.h> +#include <lprocfs_status.h> -#include "../include/lustre_req_layout.h" -#include "../include/lustre_fld.h" +#include <lustre_req_layout.h> +#include <lustre_fld.h> #include "fld_internal.h" /** diff --git a/drivers/staging/lustre/lustre/fld/fld_internal.h b/drivers/staging/lustre/lustre/fld/fld_internal.h index 3412c90b73bf..fe6f278a7d9f 100644 --- a/drivers/staging/lustre/lustre/fld/fld_internal.h +++ b/drivers/staging/lustre/lustre/fld/fld_internal.h @@ -56,11 +56,11 @@ #ifndef __FLD_INTERNAL_H #define __FLD_INTERNAL_H -#include "../../include/uapi/linux/lustre/lustre_idl.h" +#include <uapi/linux/lustre/lustre_idl.h> -#include "../../include/linux/libcfs/libcfs.h" -#include "../include/lustre_req_layout.h" -#include "../include/lustre_fld.h" +#include <linux/libcfs/libcfs.h> +#include <lustre_req_layout.h> +#include <lustre_fld.h> struct fld_stats { __u64 fst_count; diff --git a/drivers/staging/lustre/lustre/fld/fld_request.c b/drivers/staging/lustre/lustre/fld/fld_request.c index 128299272a3e..5b180830eec0 100644 --- a/drivers/staging/lustre/lustre/fld/fld_request.c +++ b/drivers/staging/lustre/lustre/fld/fld_request.c @@ -38,19 +38,19 @@ #define DEBUG_SUBSYSTEM S_FLD -#include "../../include/linux/libcfs/libcfs.h" +#include <linux/libcfs/libcfs.h> #include <linux/module.h> #include <asm/div64.h> -#include "../include/obd.h" -#include "../include/obd_class.h" -#include "../../include/uapi/linux/lustre/lustre_ver.h" -#include "../include/obd_support.h" -#include "../include/lprocfs_status.h" +#include <obd.h> +#include <obd_class.h> +#include <uapi/linux/lustre/lustre_ver.h> +#include <obd_support.h> +#include <lprocfs_status.h> -#include "../include/lustre_req_layout.h" -#include "../include/lustre_fld.h" -#include "../include/lustre_mdc.h" +#include <lustre_req_layout.h> +#include <lustre_fld.h> +#include <lustre_mdc.h> #include "fld_internal.h" static int fld_rrb_hash(struct lu_client_fld *fld, u64 seq) diff --git a/drivers/staging/lustre/lustre/fld/lproc_fld.c b/drivers/staging/lustre/lustre/fld/lproc_fld.c index b83d7ebb2d18..6cae803fc8d2 100644 --- a/drivers/staging/lustre/lustre/fld/lproc_fld.c +++ b/drivers/staging/lustre/lustre/fld/lproc_fld.c @@ -39,15 +39,15 @@ #define DEBUG_SUBSYSTEM S_FLD -#include "../../include/linux/libcfs/libcfs.h" +#include <linux/libcfs/libcfs.h> #include <linux/module.h> -#include "../include/obd.h" -#include "../include/obd_class.h" -#include "../include/obd_support.h" -#include "../include/lustre_req_layout.h" -#include "../include/lustre_fld.h" -#include "../include/lustre_fid.h" +#include <obd.h> +#include <obd_class.h> +#include <obd_support.h> +#include <lustre_req_layout.h> +#include <lustre_fld.h> +#include <lustre_fid.h> #include "fld_internal.h" static int |