diff options
| author |   James Simmons <jsimmons@infradead.org> | 2017-08-19 22:26:39 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-22 18:36:51 -0700 |
| commit | 3bca1c17543a4dfd6a75aa3155b8487d92a7d381 (patch) | |
| tree | 53b67412c4069999a331e3aae5585aa349f30589 /drivers/staging/lustre/lustre | |
| parent | staging: lustre: uapi: remove BIT macro from UAPI headers (diff) | |
| download | linux-dev-3bca1c17543a4dfd6a75aa3155b8487d92a7d381.tar.xz linux-dev-3bca1c17543a4dfd6a75aa3155b8487d92a7d381.zip | |
staging: lustre: fid: add include path to Makefile
Start to rationalize include paths in the fid source code files.
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/fid/Makefile | 3 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/fid/fid_internal.h | 4 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/fid/fid_lib.c | 4 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/fid/fid_request.c | 12 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/fid/lproc_fid.c | 12 |
5 files changed, 19 insertions, 16 deletions
diff --git a/drivers/staging/lustre/lustre/fid/Makefile b/drivers/staging/lustre/lustre/fid/Makefile index b7ef314b4b84..77b65b92667d 100644 --- a/drivers/staging/lustre/lustre/fid/Makefile +++ b/drivers/staging/lustre/lustre/fid/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) += fid.o fid-y := fid_request.o fid_lib.o lproc_fid.o diff --git a/drivers/staging/lustre/lustre/fid/fid_internal.h b/drivers/staging/lustre/lustre/fid/fid_internal.h index 5f8d15b4eed3..f48ab9d21428 100644 --- a/drivers/staging/lustre/lustre/fid/fid_internal.h +++ b/drivers/staging/lustre/lustre/fid/fid_internal.h @@ -36,8 +36,8 @@ #ifndef __FID_INTERNAL_H #define __FID_INTERNAL_H -#include "../../include/uapi/linux/lustre/lustre_idl.h" -#include "../../include/linux/libcfs/libcfs.h" +#include <uapi/linux/lustre/lustre_idl.h> +#include <linux/libcfs/libcfs.h> /* Functions used internally in module. */ diff --git a/drivers/staging/lustre/lustre/fid/fid_lib.c b/drivers/staging/lustre/lustre/fid/fid_lib.c index 6ab06efed11b..c21a5f5b7621 100644 --- a/drivers/staging/lustre/lustre/fid/fid_lib.c +++ b/drivers/staging/lustre/lustre/fid/fid_lib.c @@ -39,9 +39,9 @@ #define DEBUG_SUBSYSTEM S_FID -#include "../../include/linux/libcfs/libcfs.h" +#include <linux/libcfs/libcfs.h> #include <linux/module.h> -#include "../include/lustre_fid.h" +#include <lustre_fid.h> /** * A cluster-wide range from which fid-sequences are granted to servers and diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c index 19895faf7626..ba736239243c 100644 --- a/drivers/staging/lustre/lustre/fid/fid_request.c +++ b/drivers/staging/lustre/lustre/fid/fid_request.c @@ -38,15 +38,15 @@ #define DEBUG_SUBSYSTEM S_FID -#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_fid.h" +#include <obd.h> +#include <obd_class.h> +#include <obd_support.h> +#include <lustre_fid.h> /* mdc RPC locks */ -#include "../include/lustre_mdc.h" +#include <lustre_mdc.h> #include "fid_internal.h" static struct dentry *seq_debugfs_dir; diff --git a/drivers/staging/lustre/lustre/fid/lproc_fid.c b/drivers/staging/lustre/lustre/fid/lproc_fid.c index 3eed83808545..1a269fbc4b47 100644 --- a/drivers/staging/lustre/lustre/fid/lproc_fid.c +++ b/drivers/staging/lustre/lustre/fid/lproc_fid.c @@ -38,14 +38,14 @@ #define DEBUG_SUBSYSTEM S_FID -#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_fid.h" +#include <obd.h> +#include <obd_class.h> +#include <obd_support.h> +#include <lustre_req_layout.h> +#include <lustre_fid.h> #include "fid_internal.h" /* Format: [0x64BIT_INT - 0x64BIT_INT] + 32 bytes just in case */ |