diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 05:02:26 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-12 05:02:26 (GMT) |
commit | e0a30a6b7c0f67587c6d861b2fb72160ef68c730 (patch) | |
tree | 5192a1d4cdbeb6e9127999dcdcfd9acdcbae59a8 /drivers/staging/lustre/lustre | |
parent | 0cf0f7a7222eaea376813ca6df458b85e95e60a2 (diff) | |
download | linux-e0a30a6b7c0f67587c6d861b2fb72160ef68c730.tar.xz |
staging: lustre: lvfs: 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>
Diffstat (limited to 'drivers/staging/lustre/lustre')
-rw-r--r-- | drivers/staging/lustre/lustre/include/lustre_fsfilt.h | 2 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/lvfs/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/lvfs/fsfilt.c | 2 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 4 | ||||
-rw-r--r-- | drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 8 |
5 files changed, 8 insertions, 11 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre_fsfilt.h b/drivers/staging/lustre/lustre/include/lustre_fsfilt.h index 9dcc332..9749c3f 100644 --- a/drivers/staging/lustre/lustre/include/lustre_fsfilt.h +++ b/drivers/staging/lustre/lustre/include/lustre_fsfilt.h @@ -41,7 +41,7 @@ #ifndef _LUSTRE_FSFILT_H #define _LUSTRE_FSFILT_H -#include <linux/lustre_fsfilt.h> +#include "../include/linux/lustre_fsfilt.h" #define LU221_BAD_TIME (0x80000000U + 24 * 3600) diff --git a/drivers/staging/lustre/lustre/lvfs/Makefile b/drivers/staging/lustre/lustre/lvfs/Makefile index e0367c3..387eee3 100644 --- a/drivers/staging/lustre/lustre/lvfs/Makefile +++ b/drivers/staging/lustre/lustre/lvfs/Makefile @@ -2,6 +2,3 @@ obj-$(CONFIG_LUSTRE_FS) += lvfs.o lvfs-y := lvfs_linux.o fsfilt.o lvfs-$(CONFIG_PROC_FS) += lvfs_lib.o - - -ccflags-y := -I$(src)/../include diff --git a/drivers/staging/lustre/lustre/lvfs/fsfilt.c b/drivers/staging/lustre/lustre/lvfs/fsfilt.c index 1c0fc24..a4df056 100644 --- a/drivers/staging/lustre/lustre/lvfs/fsfilt.c +++ b/drivers/staging/lustre/lustre/lvfs/fsfilt.c @@ -39,7 +39,7 @@ #include <linux/kmod.h> #include <linux/slab.h> #include "../../include/linux/libcfs/libcfs.h" -#include <lustre_fsfilt.h> +#include "../include/lustre_fsfilt.h" LIST_HEAD(fsfilt_types); diff --git a/drivers/staging/lustre/lustre/lvfs/lvfs_lib.c b/drivers/staging/lustre/lustre/lvfs/lvfs_lib.c index 7e47fc4..cfc4f89 100644 --- a/drivers/staging/lustre/lustre/lvfs/lvfs_lib.c +++ b/drivers/staging/lustre/lustre/lvfs/lvfs_lib.c @@ -40,8 +40,8 @@ * Author: Andreas Dilger <adilger@clusterfs.com> */ #include <linux/module.h> -#include <lustre_lib.h> -#include <lprocfs_status.h> +#include "../include/lustre_lib.h" +#include "../include/lprocfs_status.h" void lprocfs_counter_add(struct lprocfs_stats *stats, int idx, long amount) { diff --git a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c index e616873..a519a5c 100644 --- a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c +++ b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c @@ -47,11 +47,11 @@ #include <linux/quotaops.h> #include <linux/module.h> #include "../../include/linux/libcfs/libcfs.h" -#include <linux/lustre_compat25.h> -#include <lvfs.h> +#include "../include/linux/lustre_compat25.h" +#include "../include/lvfs.h" -#include <obd.h> -#include <lustre_lib.h> +#include "../include/obd.h" +#include "../include/lustre_lib.h" struct lprocfs_stats *obd_memory = NULL; EXPORT_SYMBOL(obd_memory); |