mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-06 03:06:50 -04:00
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -1,6 +1,3 @@
|
||||
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
|
||||
|
||||
@@ -44,19 +44,19 @@
|
||||
#define DEBUG_SUBSYSTEM S_FLD
|
||||
|
||||
#include "../../include/linux/libcfs/libcfs.h"
|
||||
# include <linux/module.h>
|
||||
# include <asm/div64.h>
|
||||
#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 "../include/obd.h"
|
||||
#include "../include/obd_class.h"
|
||||
#include "../include/lustre_ver.h"
|
||||
#include "../include/obd_support.h"
|
||||
#include "../include/lprocfs_status.h"
|
||||
|
||||
#include <dt_object.h>
|
||||
#include <md_object.h>
|
||||
#include <lustre_req_layout.h>
|
||||
#include <lustre_fld.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"
|
||||
|
||||
/**
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -43,20 +43,20 @@
|
||||
#define DEBUG_SUBSYSTEM S_FLD
|
||||
|
||||
#include "../../include/linux/libcfs/libcfs.h"
|
||||
# include <linux/module.h>
|
||||
# include <asm/div64.h>
|
||||
#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 "../include/obd.h"
|
||||
#include "../include/obd_class.h"
|
||||
#include "../include/lustre_ver.h"
|
||||
#include "../include/obd_support.h"
|
||||
#include "../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/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
|
||||
|
||||
@@ -44,16 +44,16 @@
|
||||
#define DEBUG_SUBSYSTEM S_FLD
|
||||
|
||||
#include "../../include/linux/libcfs/libcfs.h"
|
||||
# include <linux/module.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
|
||||
|
||||
Reference in New Issue
Block a user