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

staging: lustre: remove top level ccflags variable 



We need to remove the ccflags from the Lustre code as it prevents
individual object files from building properly in the kernel build
system.  It also hids the horrid mess that the Lustre include files are
made up of.

Start out by removing the toplevel ccflags variable pointing to
drivers/staging/lustre/include/ as a valid include path.  This requires
the absolute include markings of a bunch of .h and .c files, which is
also done here.

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 f81d2eaa

drivers/staging/lustre/Makefile

+0 −2
Original line number Diff line number Diff line 
subdir-ccflags-y := -I$(src)/include/



obj-$(CONFIG_LNET)		+= lnet/

obj-$(CONFIG_LUSTRE_FS)		+= lustre/

drivers/staging/lustre/include/linux/libcfs/libcfs.h

+15 −15
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#define __attribute__(x)

#endif



#include <linux/libcfs/linux/libcfs.h>

#include "linux/libcfs.h"

#include <linux/gfp.h>



#include "curproc.h"
@@ -155,20 +155,20 @@ unsigned int cfs_rand(void); 
void cfs_srand(unsigned int, unsigned int);

void cfs_get_random_bytes(void *buf, int size);



#include <linux/libcfs/libcfs_debug.h>

#include <linux/libcfs/libcfs_cpu.h>

#include <linux/libcfs/libcfs_private.h>

#include <linux/libcfs/libcfs_ioctl.h>

#include <linux/libcfs/libcfs_prim.h>

#include <linux/libcfs/libcfs_time.h>

#include <linux/libcfs/libcfs_string.h>

#include <linux/libcfs/libcfs_kernelcomm.h>

#include <linux/libcfs/libcfs_workitem.h>

#include <linux/libcfs/libcfs_hash.h>

#include <linux/libcfs/libcfs_heap.h>

#include <linux/libcfs/libcfs_fail.h>

#include <linux/libcfs/params_tree.h>

#include <linux/libcfs/libcfs_crypto.h>

#include "libcfs_debug.h"

#include "libcfs_cpu.h"

#include "libcfs_private.h"

#include "libcfs_ioctl.h"

#include "libcfs_prim.h"

#include "libcfs_time.h"

#include "libcfs_string.h"

#include "libcfs_kernelcomm.h"

#include "libcfs_workitem.h"

#include "libcfs_hash.h"

#include "libcfs_heap.h"

#include "libcfs_fail.h"

#include "params_tree.h"

#include "libcfs_crypto.h"



/* container_of depends on "likely" which is defined in libcfs_private.h */

static inline void *__container_of(void *ptr, unsigned long shift)

drivers/staging/lustre/include/linux/libcfs/libcfs_private.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#define __LIBCFS_PRIVATE_H__



/* XXX this layering violation is for nidstrings */

#include <linux/lnet/types.h>

#include "../lnet/types.h"



#ifndef DEBUG_SUBSYSTEM

# define DEBUG_SUBSYSTEM S_UNDEFINED

drivers/staging/lustre/include/linux/libcfs/linux/kp30.h

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

#include <linux/scatterlist.h>



#include <linux/libcfs/linux/portals_compat25.h>

#include "portals_compat25.h"



/* this is a bit chunky */

drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h

+9 −9
Original line number Diff line number Diff line
@@ -44,15 +44,15 @@ 




#include <stdarg.h>

#include <linux/libcfs/linux/linux-cpu.h>

#include <linux/libcfs/linux/linux-time.h>

#include <linux/libcfs/linux/linux-mem.h>

#include <linux/libcfs/linux/linux-prim.h>

#include <linux/libcfs/linux/linux-lock.h>

#include <linux/libcfs/linux/linux-tcpip.h>

#include <linux/libcfs/linux/linux-bitops.h>

#include <linux/libcfs/linux/linux-types.h>

#include <linux/libcfs/linux/kp30.h>

#include "linux-cpu.h"

#include "linux-time.h"

#include "linux-mem.h"

#include "linux-prim.h"

#include "linux-lock.h"

#include "linux-tcpip.h"

#include "linux-bitops.h"

#include "linux-types.h"

#include "kp30.h"



#include <asm/types.h>

#include <linux/types.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE