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

staging: lustre: lvfs: 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 0cf0f7a7

drivers/staging/lustre/lustre/include/lustre_fsfilt.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#ifndef _LUSTRE_FSFILT_H

#define _LUSTRE_FSFILT_H



#include <linux/lustre_fsfilt.h>

#include "../include/linux/lustre_fsfilt.h"



#define LU221_BAD_TIME (0x80000000U + 24 * 3600)

drivers/staging/lustre/lustre/lvfs/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -2,6 +2,3 @@ obj-$(CONFIG_LUSTRE_FS) += lvfs.o 


lvfs-y := lvfs_linux.o fsfilt.o

lvfs-$(CONFIG_PROC_FS) += lvfs_lib.o
 




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

drivers/staging/lustre/lustre/lvfs/fsfilt.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <linux/kmod.h>

#include <linux/slab.h>

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

#include <lustre_fsfilt.h>

#include "../include/lustre_fsfilt.h"



LIST_HEAD(fsfilt_types);

drivers/staging/lustre/lustre/lvfs/lvfs_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ 
 * Author: Andreas Dilger <adilger@clusterfs.com>

 */

#include <linux/module.h>

#include <lustre_lib.h>

#include <lprocfs_status.h>

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

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



void lprocfs_counter_add(struct lprocfs_stats *stats, int idx, long amount)

{

drivers/staging/lustre/lustre/lvfs/lvfs_linux.c

+4 −4
Original line number Diff line number Diff line
@@ -47,11 +47,11 @@ 
#include <linux/quotaops.h>

#include <linux/module.h>

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

#include <linux/lustre_compat25.h>

#include <lvfs.h>

#include "../include/linux/lustre_compat25.h"

#include "../include/lvfs.h"



#include <obd.h>

#include <lustre_lib.h>

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

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



struct lprocfs_stats *obd_memory = NULL;

EXPORT_SYMBOL(obd_memory);

CRA Git | Maintained and supported by SUSTech CRA and CCSE