From 615663918afdb21ed72f23561ab8e5a7a9cdacfd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Jul 2014 21:50:29 -0700 Subject: [PATCH] staging: lustre: fid: remove ccflags from Makefile Also fix up the relative paths in the .c files to properly build now Cc: Andreas Dilger Cc: Oleg Drokin Cc: hpdd-discuss Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/fid/Makefile | 3 --- drivers/staging/lustre/lustre/fid/fid_internal.h | 2 +- drivers/staging/lustre/lustre/fid/fid_lib.c | 4 ++-- drivers/staging/lustre/lustre/fid/fid_request.c | 10 +++++----- drivers/staging/lustre/lustre/fid/lproc_fid.c | 14 +++++++------- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/staging/lustre/lustre/fid/Makefile b/drivers/staging/lustre/lustre/fid/Makefile index d24f2df7c0af..5513ce416a35 100644 --- a/drivers/staging/lustre/lustre/fid/Makefile +++ b/drivers/staging/lustre/lustre/fid/Makefile @@ -1,6 +1,3 @@ obj-$(CONFIG_LUSTRE_FS) += fid.o fid-y := fid_request.o fid_lib.o fid-$(CONFIG_PROC_FS) += lproc_fid.o - - -ccflags-y := -I$(src)/../include diff --git a/drivers/staging/lustre/lustre/fid/fid_internal.h b/drivers/staging/lustre/lustre/fid/fid_internal.h index 59381d368d9c..6049e3ef4d8a 100644 --- a/drivers/staging/lustre/lustre/fid/fid_internal.h +++ b/drivers/staging/lustre/lustre/fid/fid_internal.h @@ -40,7 +40,7 @@ #ifndef __FID_INTERNAL_H #define __FID_INTERNAL_H -#include +#include "../include/lustre/lustre_idl.h" #include "../../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 a75d4bbf7cbd..dd65159ebb38 100644 --- a/drivers/staging/lustre/lustre/fid/fid_lib.c +++ b/drivers/staging/lustre/lustre/fid/fid_lib.c @@ -45,8 +45,8 @@ #include "../../include/linux/libcfs/libcfs.h" #include -#include -#include +#include "../include/lustre/lustre_idl.h" +#include "../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 2127ad9b1785..d0c7a954c12c 100644 --- a/drivers/staging/lustre/lustre/fid/fid_request.c +++ b/drivers/staging/lustre/lustre/fid/fid_request.c @@ -45,12 +45,12 @@ #include "../../include/linux/libcfs/libcfs.h" #include -#include -#include -#include -#include +#include "../include/obd.h" +#include "../include/obd_class.h" +#include "../include/obd_support.h" +#include "../include/lustre_fid.h" /* mdc RPC locks */ -#include +#include "../include/lustre_mdc.h" #include "fid_internal.h" static int seq_client_rpc(struct lu_client_seq *seq, diff --git a/drivers/staging/lustre/lustre/fid/lproc_fid.c b/drivers/staging/lustre/lustre/fid/lproc_fid.c index 3bbcedaceae9..4302c1e9376f 100644 --- a/drivers/staging/lustre/lustre/fid/lproc_fid.c +++ b/drivers/staging/lustre/lustre/fid/lproc_fid.c @@ -45,13 +45,13 @@ #include "../../include/linux/libcfs/libcfs.h" #include -#include -#include -#include -#include -#include -#include -#include +#include "../include/obd.h" +#include "../include/obd_class.h" +#include "../include/dt_object.h" +#include "../include/md_object.h" +#include "../include/obd_support.h" +#include "../include/lustre_req_layout.h" +#include "../include/lustre_fid.h" #include "fid_internal.h" /* Format: [0x64BIT_INT - 0x64BIT_INT] + 32 bytes just in case */ -- 2.39.5