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

staging: lustre: lmv: 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67a235f5

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
#define _LUSTRE_IDL_H_



#if !defined(LPU64)

#include "../../include/linux/libcfs/libcfs.h"	/* for LPUX64, etc */

#include "../../../include/linux/libcfs/libcfs.h"	/* for LPUX64, etc */

#endif



/* Defn's shared with user-space. */

drivers/staging/lustre/lustre/lmv/Makefile

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

lmv-y := lmv_obd.o lmv_intent.o lmv_fld.o

lmv-$(CONFIG_PROC_FS) += lproc_lmv.o
 


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

drivers/staging/lustre/lustre/lmv/lmv_fld.c

+8 −8
Original line number Diff line number Diff line
@@ -41,14 +41,14 @@ 
#include <asm/div64.h>

#include <linux/seq_file.h>



#include <obd_support.h>

#include <lustre/lustre_idl.h>

#include <lustre_fid.h>

#include <lustre_lib.h>

#include <lustre_net.h>

#include <lustre_dlm.h>

#include <obd_class.h>

#include <lprocfs_status.h>

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

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

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

#include "../include/lustre_lib.h"

#include "../include/lustre_net.h"

#include "../include/lustre_dlm.h"

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

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

#include "lmv_internal.h"



int lmv_fld_lookup(struct lmv_obd *lmv,

drivers/staging/lustre/lustre/lmv/lmv_intent.c

+8 −9
Original line number Diff line number Diff line
@@ -41,15 +41,14 @@ 
#include <asm/div64.h>

#include <linux/seq_file.h>

#include <linux/namei.h>

#include <linux/lustre_intent.h>



#include <obd_support.h>

#include <lustre/lustre_idl.h>

#include <lustre_lib.h>

#include <lustre_net.h>

#include <lustre_dlm.h>

#include <obd_class.h>

#include <lprocfs_status.h>

#include "../include/linux/lustre_intent.h"

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

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

#include "../include/lustre_lib.h"

#include "../include/lustre_net.h"

#include "../include/lustre_dlm.h"

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

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

#include "lmv_internal.h"



static int lmv_intent_remote(struct obd_export *exp, void *lmm,

drivers/staging/lustre/lustre/lmv/lmv_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
#ifndef _LMV_INTERNAL_H_

#define _LMV_INTERNAL_H_



#include <lustre/lustre_idl.h>

#include <obd.h>

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

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



#define LMV_MAX_TGT_COUNT 128

CRA Git | Maintained and supported by SUSTech CRA and CCSE