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>

diff --git a/drivers/staging/lustre/lustre/include/lustre_fsfilt.h b/drivers/staging/lustre/lustre/include/lustre_fsfilt.h
index 9dcc332cb2f3f5ff8438ae52505f791c1b859984..9749c3f5568e5b60f390be748e9a8defbd676ad6 100644 (file)
--- 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 e0367c3fc416e7d62e6c3c9ca6c0bb25ce2e1f69..387eee307e2d513687d2d51287512407b0990b54 100644 (file)
--- 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 1c0fc24e6bdca12416665c631d13d8fb01956310..a4df056a2853e64c7d7c1faeda8a914f425bfcca 100644 (file)
--- 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 7e47fc4a7e4e53b8c31cc9ad4a2d4492769af14f..cfc4f896b127e28dd4d44488b51ff2b4356ca818 100644 (file)
--- 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 e616873933f437832f3403669051ee8f18d29693..a519a5ca69ba3d612a12b0b137446ea234e06c5e 100644 (file)
--- 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);