From 3ee300153882afefa2a093b4f5f456ef1b778530 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 11 Jul 2014 22:16:18 -0700 Subject: [PATCH] staging: lustre: osc: remove ccflags from Makefile Fix up the relative paths in the .c files to properly build with the Makefile change. Cc: Andreas Dilger Cc: Oleg Drokin Cc: hpdd-discuss Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/osc/Makefile | 4 ---- drivers/staging/lustre/lustre/osc/lproc_osc.c | 6 ++--- .../lustre/lustre/osc/osc_cl_internal.h | 8 +++---- drivers/staging/lustre/lustre/osc/osc_dev.c | 2 +- .../staging/lustre/lustre/osc/osc_internal.h | 2 +- drivers/staging/lustre/lustre/osc/osc_lock.c | 2 +- drivers/staging/lustre/lustre/osc/osc_quota.c | 2 +- .../staging/lustre/lustre/osc/osc_request.c | 24 +++++++++---------- 8 files changed, 23 insertions(+), 27 deletions(-) diff --git a/drivers/staging/lustre/lustre/osc/Makefile b/drivers/staging/lustre/lustre/osc/Makefile index 4488162d228a..54927fba4eb4 100644 --- a/drivers/staging/lustre/lustre/osc/Makefile +++ b/drivers/staging/lustre/lustre/osc/Makefile @@ -2,7 +2,3 @@ obj-$(CONFIG_LUSTRE_FS) += osc.o osc-y := osc_request.o osc_dev.o osc_object.o \ osc_page.o osc_lock.o osc_io.o osc_quota.o osc_cache.o osc-$(CONFIG_PROC_FS) += lproc_osc.o - - - -ccflags-y := -I$(src)/../include diff --git a/drivers/staging/lustre/lustre/osc/lproc_osc.c b/drivers/staging/lustre/lustre/osc/lproc_osc.c index 0cadfcd92262..9b2e5656bb68 100644 --- a/drivers/staging/lustre/lustre/osc/lproc_osc.c +++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c @@ -36,9 +36,9 @@ #define DEBUG_SUBSYSTEM S_CLASS #include -#include -#include -#include +#include "../include/obd_cksum.h" +#include "../include/obd_class.h" +#include "../include/lprocfs_status.h" #include #include "osc_internal.h" diff --git a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h index 9fe79f30d936..e32a817e7ded 100644 --- a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h +++ b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h @@ -48,11 +48,11 @@ #include "../../include/linux/libcfs/libcfs.h" -#include +#include "../include/obd.h" /* osc_build_res_name() */ -#include -#include -#include +#include "../include/obd_ost.h" +#include "../include/cl_object.h" +#include "../include/lclient.h" #include "osc_internal.h" /** \defgroup osc osc diff --git a/drivers/staging/lustre/lustre/osc/osc_dev.c b/drivers/staging/lustre/lustre/osc/osc_dev.c index 048a5a5cf7f5..4935fc7c0706 100644 --- a/drivers/staging/lustre/lustre/osc/osc_dev.c +++ b/drivers/staging/lustre/lustre/osc/osc_dev.c @@ -41,7 +41,7 @@ #define DEBUG_SUBSYSTEM S_OSC /* class_name2obd() */ -#include +#include "../include/obd_class.h" #include "osc_cl_internal.h" diff --git a/drivers/staging/lustre/lustre/osc/osc_internal.h b/drivers/staging/lustre/lustre/osc/osc_internal.h index 9c4a189639ae..0e08891cca3e 100644 --- a/drivers/staging/lustre/lustre/osc/osc_internal.h +++ b/drivers/staging/lustre/lustre/osc/osc_internal.h @@ -97,7 +97,7 @@ void osc_update_next_shrink(struct client_obd *cli); /* * cl integration. */ -#include +#include "../include/cl_object.h" extern struct ptlrpc_request_set *PTLRPCD_SET; diff --git a/drivers/staging/lustre/lustre/osc/osc_lock.c b/drivers/staging/lustre/lustre/osc/osc_lock.c index be677ddeed59..7a74c75939b7 100644 --- a/drivers/staging/lustre/lustre/osc/osc_lock.c +++ b/drivers/staging/lustre/lustre/osc/osc_lock.c @@ -42,7 +42,7 @@ #include "../../include/linux/libcfs/libcfs.h" /* fid_build_reg_res_name() */ -#include +#include "../include/lustre_fid.h" #include "osc_cl_internal.h" diff --git a/drivers/staging/lustre/lustre/osc/osc_quota.c b/drivers/staging/lustre/lustre/osc/osc_quota.c index 0235fabaaffe..3563809072b4 100644 --- a/drivers/staging/lustre/lustre/osc/osc_quota.c +++ b/drivers/staging/lustre/lustre/osc/osc_quota.c @@ -28,7 +28,7 @@ * Code originally extracted from quota directory */ -#include +#include "../include/obd_ost.h" #include "osc_internal.h" static inline struct osc_quota_info *osc_oqi_alloc(obd_uid id) diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c index 6749bc415c9f..614d8b5f6cc4 100644 --- a/drivers/staging/lustre/lustre/osc/osc_request.c +++ b/drivers/staging/lustre/lustre/osc/osc_request.c @@ -39,18 +39,18 @@ #include "../../include/linux/libcfs/libcfs.h" -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include +#include "../include/lustre_dlm.h" +#include "../include/lustre_net.h" +#include "../include/lustre/lustre_user.h" +#include "../include/obd_cksum.h" +#include "../include/obd_ost.h" + +#include "../include/lustre_ha.h" +#include "../include/lprocfs_status.h" +#include "../include/lustre_log.h" +#include "../include/lustre_debug.h" +#include "../include/lustre_param.h" +#include "../include/lustre_fid.h" #include "osc_internal.h" #include "osc_cl_internal.h" -- GitLab