diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 05:16:07 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 05:16:07 (GMT) |
commit | 73060ed93a16792520d73796ecb1ac94d5a6f15a (patch) | |
tree | 2b0ba7a40791a3d85b290cbb6f258ff30ba05c92 | |
parent | 610f73773a8d263f2a6efa21a18cedafa3f2763b (diff) | |
download | linux-73060ed93a16792520d73796ecb1ac94d5a6f15a.tar.xz |
staging: lustre: mgc: remove ccflags from Makefile
Fix up the relative paths in the .c files to properly build with the
Makefile change.
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/lustre/lustre/mgc/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/mgc/libmgc.c | 12 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 4 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/mgc/mgc_internal.h | 10 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/mgc/mgc_request.c | 12 |
5 files changed, 19 insertions, 22 deletions
diff --git a/drivers/staging/lustre/lustre/mgc/Makefile b/drivers/staging/lustre/lustre/mgc/Makefile index 2f5ee64..cc6e9f5 100644 --- a/drivers/staging/lustre/lustre/mgc/Makefile +++ b/drivers/staging/lustre/lustre/mgc/Makefile @@ -1,6 +1,3 @@ obj-$(CONFIG_LUSTRE_FS) += mgc.o mgc-y := mgc_request.o mgc-$(CONFIG_PROC_FS) += lproc_mgc.o - - -ccflags-y := -I$(src)/../include diff --git a/drivers/staging/lustre/lustre/mgc/libmgc.c b/drivers/staging/lustre/lustre/mgc/libmgc.c index 9b40c57..8012f0f 100644 --- a/drivers/staging/lustre/lustre/mgc/libmgc.c +++ b/drivers/staging/lustre/lustre/mgc/libmgc.c @@ -44,13 +44,13 @@ #define DEBUG_SUBSYSTEM S_MGC -#include <liblustre.h> +#include "../include/liblustre.h" -#include <obd_class.h> -#include <lustre_dlm.h> -#include <lustre_log.h> -#include <lustre_fsfilt.h> -#include <lustre_disk.h> +#include "../include/obd_class.h" +#include "../include/lustre_dlm.h" +#include "../include/lustre_log.h" +#include "../include/lustre_fsfilt.h" +#include "../include/lustre_disk.h" static int mgc_setup(struct obd_device *obd, struct lustre_cfg *lcfg) diff --git a/drivers/staging/lustre/lustre/mgc/lproc_mgc.c b/drivers/staging/lustre/lustre/mgc/lproc_mgc.c index 6c877c5..c4ea38e 100644 --- a/drivers/staging/lustre/lustre/mgc/lproc_mgc.c +++ b/drivers/staging/lustre/lustre/mgc/lproc_mgc.c @@ -36,8 +36,8 @@ #define DEBUG_SUBSYSTEM S_CLASS #include <linux/vfs.h> -#include <obd_class.h> -#include <lprocfs_status.h> +#include "../include/obd_class.h" +#include "../include/lprocfs_status.h" #include "mgc_internal.h" LPROC_SEQ_FOPS_RO_TYPE(mgc, uuid); diff --git a/drivers/staging/lustre/lustre/mgc/mgc_internal.h b/drivers/staging/lustre/lustre/mgc/mgc_internal.h index 648b443..b01d2db 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_internal.h +++ b/drivers/staging/lustre/lustre/mgc/mgc_internal.h @@ -38,11 +38,11 @@ #define _MGC_INTERNAL_H #include "../../include/linux/libcfs/libcfs.h" -#include <lustre/lustre_idl.h> -#include <lustre_lib.h> -#include <lustre_dlm.h> -#include <lustre_log.h> -#include <lustre_export.h> +#include "../include/lustre/lustre_idl.h" +#include "../include/lustre_lib.h" +#include "../include/lustre_dlm.h" +#include "../include/lustre_log.h" +#include "../include/lustre_export.h" #ifdef LPROCFS void lprocfs_mgc_init_vars(struct lprocfs_static_vars *lvars); diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index 28960f9..54ea5fd 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -42,12 +42,12 @@ #define D_MGC D_CONFIG /*|D_WARNING*/ #include <linux/module.h> -#include <obd_class.h> -#include <lustre_dlm.h> -#include <lprocfs_status.h> -#include <lustre_log.h> -#include <lustre_disk.h> -#include <dt_object.h> +#include "../include/obd_class.h" +#include "../include/lustre_dlm.h" +#include "../include/lprocfs_status.h" +#include "../include/lustre_log.h" +#include "../include/lustre_disk.h" +#include "../include/dt_object.h" #include "mgc_internal.h" |