Commit 0e9ad0ef authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: fld: remove ccflags from Makefile 



Also fix up the relative paths in the .c files to properly build
now

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61566391

drivers/staging/lustre/lustre/fld/Makefile

+0 −3
Original line number Diff line number Diff line 
obj-$(CONFIG_LUSTRE_FS) += fld.o

fld-y := fld_request.o fld_cache.o

fld-$(CONFIG_PROC_FS) += lproc_fld.o
 




ccflags-y := -I$(src)/../include

drivers/staging/lustre/lustre/fld/fld_cache.c

+13 −13
Original line number Diff line number Diff line
@@ -47,16 +47,16 @@ 
#include <linux/module.h>

#include <asm/div64.h>



#include <obd.h>

#include <obd_class.h>

#include <lustre_ver.h>

#include <obd_support.h>

#include <lprocfs_status.h>



#include <dt_object.h>

#include <md_object.h>

#include <lustre_req_layout.h>

#include <lustre_fld.h>

#include "../include/obd.h"

#include "../include/obd_class.h"

#include "../include/lustre_ver.h"

#include "../include/obd_support.h"

#include "../include/lprocfs_status.h"



#include "../include/dt_object.h"

#include "../include/md_object.h"

#include "../include/lustre_req_layout.h"

#include "../include/lustre_fld.h"

#include "fld_internal.h"



/**

drivers/staging/lustre/lustre/fld/fld_internal.h

+4 −4
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ 
#ifndef __FLD_INTERNAL_H

#define __FLD_INTERNAL_H



#include <lustre/lustre_idl.h>

#include <dt_object.h>

#include "../include/lustre/lustre_idl.h"

#include "../include/dt_object.h"



#include "../../include/linux/libcfs/libcfs.h"

#include <lustre_req_layout.h>

#include <lustre_fld.h>

#include "../include/lustre_req_layout.h"

#include "../include/lustre_fld.h"



enum {

	LUSTRE_FLD_INIT = 1 << 0,

drivers/staging/lustre/lustre/fld/fld_request.c

+14 −14
Original line number Diff line number Diff line
@@ -46,17 +46,17 @@ 
#include <linux/module.h>

#include <asm/div64.h>



#include <obd.h>

#include <obd_class.h>

#include <lustre_ver.h>

#include <obd_support.h>

#include <lprocfs_status.h>



#include <dt_object.h>

#include <md_object.h>

#include <lustre_req_layout.h>

#include <lustre_fld.h>

#include <lustre_mdc.h>

#include "../include/obd.h"

#include "../include/obd_class.h"

#include "../include/lustre_ver.h"

#include "../include/obd_support.h"

#include "../include/lprocfs_status.h"



#include "../include/dt_object.h"

#include "../include/md_object.h"

#include "../include/lustre_req_layout.h"

#include "../include/lustre_fld.h"

#include "../include/lustre_mdc.h"

#include "fld_internal.h"



/* TODO: these 3 functions are copies of flow-control code from mdc_lib.c

drivers/staging/lustre/lustre/fld/lproc_fld.c

+10 −10
Original line number Diff line number Diff line
@@ -46,14 +46,14 @@ 
#include "../../include/linux/libcfs/libcfs.h"

#include <linux/module.h>



#include <obd.h>

#include <obd_class.h>

#include <dt_object.h>

#include <md_object.h>

#include <obd_support.h>

#include <lustre_req_layout.h>

#include <lustre_fld.h>

#include <lustre_fid.h>

#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_fld.h"

#include "../include/lustre_fid.h"

#include "fld_internal.h"



static int

CRA Git | Maintained and supported by SUSTech CRA and CCSE