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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-07-11 20:51:16 -07:00 · 2014-07-11 20:51:16 -07:00 · 9fdaf8c0b9
--- a/drivers/staging/lustre/Makefile
+++ b/drivers/staging/lustre/Makefile
@ -1,4 +1,2 @@
-subdir-ccflags-y := -I$(src)/include/
-
 obj-$(CONFIG_LNET)		+= lnet/
 obj-$(CONFIG_LUSTRE_FS)		+= lustre/
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@ -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)
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
@ -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
--- a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
@ -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 */

--- a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h
@ -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>
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@ -57,10 +57,10 @@
 #include <linux/random.h>

 #include <linux/miscdevice.h>
-#include <linux/libcfs/linux/portals_compat25.h>
+#include "portals_compat25.h"
 #include <asm/div64.h>

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

 /*
 * Sysctl register
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
@ -94,7 +94,7 @@
 #include <linux/time.h>
 #include <asm/div64.h>

-#include <linux/libcfs/linux/portals_compat25.h>
+#include "portals_compat25.h"

 /*
 * post 2.5 kernels.
--- a/drivers/staging/lustre/include/linux/libcfs/lucache.h
+++ b/drivers/staging/lustre/include/linux/libcfs/lucache.h
@ -37,7 +37,7 @@
 #ifndef _LUCACHE_H
 #define _LUCACHE_H

-#include <linux/libcfs/libcfs.h>
+#include "libcfs.h"

 /** \defgroup ucache ucache
 *
--- a/drivers/staging/lustre/include/linux/libcfs/params_tree.h
+++ b/drivers/staging/lustre/include/linux/libcfs/params_tree.h
@ -40,7 +40,7 @@
 #ifndef __PARAMS_TREE_H__
 #define __PARAMS_TREE_H__

-#include <linux/libcfs/libcfs.h>
+#include "libcfs.h"

 #undef LPROCFS
 #if  defined(CONFIG_PROC_FS)
--- a/drivers/staging/lustre/include/linux/lnet/api-support.h
+++ b/drivers/staging/lustre/include/linux/lnet/api-support.h
@ -35,10 +35,10 @@
 #ifndef __LNET_API_SUPPORT_H__
 #define __LNET_API_SUPPORT_H__

-#include <linux/lnet/linux/api-support.h>
+#include "linux/api-support.h"

-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/types.h>
-#include <linux/lnet/lnet.h>
+#include "../libcfs/libcfs.h"
+#include "types.h"
+#include "lnet.h"

 #endif
--- a/drivers/staging/lustre/include/linux/lnet/api.h
+++ b/drivers/staging/lustre/include/linux/lnet/api.h
@ -47,7 +47,7 @@
 * @{
 */

-#include <linux/lnet/types.h>
+#include "../lnet/types.h"

 /** \defgroup lnet_init_fini Initialization and cleanup
 * The LNet must be properly initialized before any LNet calls can be made.
--- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
@ -41,12 +41,11 @@
 #ifndef __LNET_LIB_LNET_H__
 #define __LNET_LIB_LNET_H__

-#include <linux/lnet/linux/lib-lnet.h>
-
-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/types.h>
-#include <linux/lnet/lnet.h>
-#include <linux/lnet/lib-types.h>
+#include "linux/lib-lnet.h"
+#include "../libcfs/libcfs.h"
+#include "types.h"
+#include "lnet.h"
+#include "lib-types.h"

 extern lnet_t  the_lnet;			/* THE network */

--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@ -42,11 +42,11 @@
 #ifndef __LNET_LIB_TYPES_H__
 #define __LNET_LIB_TYPES_H__

-#include <linux/lnet/linux/lib-types.h>
+#include "linux/lib-types.h"

-#include <linux/libcfs/libcfs.h>
+#include "../libcfs/libcfs.h"
 #include <linux/list.h>
-#include <linux/lnet/types.h>
+#include "types.h"

 #define WIRE_ATTR       __attribute__((packed))

--- a/drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h
@ -42,7 +42,7 @@
 # include <asm/page.h>
 # include <linux/string.h>
 # include <asm/io.h>
-# include <linux/libcfs/libcfs.h>
+#include "../../libcfs/libcfs.h"

 static inline __u64
 lnet_page2phys (struct page *p)
--- a/drivers/staging/lustre/include/linux/lnet/lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/lnet.h
@ -40,10 +40,10 @@
 *
 * User application interface file
 */
-#include <linux/lnet/linux/lnet.h>
+#include "linux/lnet.h"

-#include <linux/lnet/types.h>
-#include <linux/lnet/api.h>
+#include "types.h"
+#include "api.h"

 #define LNET_NIDSTR_COUNT  1024    /* # of nidstrings */
 #define LNET_NIDSTR_SIZE   32      /* size of each one (see below for usage) */
--- a/drivers/staging/lustre/include/linux/lnet/lnetctl.h
+++ b/drivers/staging/lustre/include/linux/lnet/lnetctl.h
@ -19,8 +19,8 @@
 #ifndef _PTLCTL_H_
 #define _PTLCTL_H_

-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/types.h>
+#include "../libcfs/libcfs.h"
+#include "types.h"

 #define LNET_DEV_ID 0
 #define LNET_DEV_PATH "/dev/lnet"
--- a/drivers/staging/lustre/include/linux/lnet/lnetst.h
+++ b/drivers/staging/lustre/include/linux/lnet/lnetst.h
@ -41,9 +41,9 @@
 #ifndef __LNET_ST_H__
 #define __LNET_ST_H__

-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lnet.h>
-#include <linux/lnet/lib-types.h>
+#include "../libcfs/libcfs.h"
+#include "lnet.h"
+#include "lib-types.h"

 #define LST_FEAT_NONE		(0)
 #define LST_FEAT_BULK_LEN	(1 << 0)	/* enable variable page size */
--- a/drivers/staging/lustre/include/linux/lnet/socklnd.h
+++ b/drivers/staging/lustre/include/linux/lnet/socklnd.h
@ -38,8 +38,8 @@
 #ifndef __LNET_LNET_SOCKLND_H__
 #define __LNET_LNET_SOCKLND_H__

-#include <linux/lnet/types.h>
-#include <linux/lnet/lib-types.h>
+#include "types.h"
+#include "lib-types.h"

 #define SOCKLND_CONN_NONE     (-1)
 #define SOCKLND_CONN_ANY	0
--- a/drivers/staging/lustre/include/linux/lnet/types.h
+++ b/drivers/staging/lustre/include/linux/lnet/types.h
@ -40,7 +40,7 @@
 /** \addtogroup lnet
 * @{ */

-#include <linux/libcfs/libcfs.h>
+#include "../libcfs/libcfs.h"

 /** \addtogroup lnet_addr
 * @{ */
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
@ -30,11 +30,11 @@

 #include "socklnd_lib-linux.h"

-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lnet.h>
-#include <linux/lnet/lib-lnet.h>
-#include <linux/lnet/socklnd.h>
-#include <linux/lnet/lnet-sysctl.h>
+#include "../../../include/linux/libcfs/libcfs.h"
+#include "../../../include/linux/lnet/lnet.h"
+#include "../../../include/linux/lnet/lib-lnet.h"
+#include "../../../include/linux/lnet/socklnd.h"
+#include "../../../include/linux/lnet/lnet-sysctl.h"

 #define SOCKNAL_PEER_HASH_SIZE  101	     /* # peer lists */
 #define SOCKNAL_RESCHED	 100	     /* # scheduler loops before reschedule */
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h
@ -62,8 +62,8 @@
 #include <asm/div64.h>
 #include <linux/syscalls.h>

-#include <linux/libcfs/libcfs.h>
-#include <linux/libcfs/linux/portals_compat25.h>
+#include "../../../include/linux/libcfs/libcfs.h"
+#include "../../../include/linux/libcfs/linux/portals_compat25.h"

 #include <linux/crc32.h>
 static inline __u32 ksocknal_csum(__u32 crc, unsigned char const *p, size_t len)
--- a/drivers/staging/lustre/lnet/lnet/acceptor.c
+++ b/drivers/staging/lustre/lnet/lnet/acceptor.c
@ -35,7 +35,7 @@
 */

 #define DEBUG_SUBSYSTEM S_LNET
-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"


 static int   accept_port    = 988;
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@ -35,7 +35,7 @@
 */

 #define DEBUG_SUBSYSTEM S_LNET
-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"
 #include <linux/log2.h>

 #define D_LNI D_CONSOLE
--- a/drivers/staging/lustre/lnet/lnet/config.c
+++ b/drivers/staging/lustre/lnet/lnet/config.c
@ -35,7 +35,7 @@
 */

 #define DEBUG_SUBSYSTEM S_LNET
-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 typedef struct {			    /* tmp struct for parsing routes */
 	struct list_head	 ltb_list;	/* stash on lists */
--- a/drivers/staging/lustre/lnet/lnet/lib-eq.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-eq.c
@ -39,7 +39,7 @@
 */

 #define DEBUG_SUBSYSTEM S_LNET
-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 /**
 * Create an event queue that has room for \a count number of events.
--- a/drivers/staging/lustre/lnet/lnet/lib-md.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-md.c
@ -40,7 +40,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 /* must be called with lnet_res_lock held */
 void
--- a/drivers/staging/lustre/lnet/lnet/lib-me.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-me.c
@ -40,7 +40,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 /**
 * Create and attach a match entry to the match list of \a portal. The new
--- a/drivers/staging/lustre/lnet/lnet/lib-move.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-move.c
@ -40,7 +40,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 static int local_nid_dist_zero = 1;
 module_param(local_nid_dist_zero, int, 0444);
--- a/drivers/staging/lustre/lnet/lnet/lib-msg.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-msg.c
@ -40,7 +40,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 void
 lnet_build_unlink_event(lnet_libmd_t *md, lnet_event_t *ev)
--- a/drivers/staging/lustre/lnet/lnet/lib-ptl.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-ptl.c
@ -36,7 +36,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 /* NB: add /proc interfaces in upcoming patches */
 int	portal_rotor	= LNET_PTL_ROTOR_HASH_RT;
--- a/drivers/staging/lustre/lnet/lnet/lo.c
+++ b/drivers/staging/lustre/lnet/lnet/lo.c
@ -33,7 +33,7 @@
 */

 #define DEBUG_SUBSYSTEM S_LNET
-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 int
 lolnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
--- a/drivers/staging/lustre/lnet/lnet/module.c
+++ b/drivers/staging/lustre/lnet/lnet/module.c
@ -35,7 +35,7 @@
 */

 #define DEBUG_SUBSYSTEM S_LNET
-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 static int config_on_load;
 module_param(config_on_load, int, 0444);
--- a/drivers/staging/lustre/lnet/lnet/peer.c
+++ b/drivers/staging/lustre/lnet/lnet/peer.c
@ -38,7 +38,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 int
 lnet_peer_tables_create(void)
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@ -22,7 +22,7 @@
 */

 #define DEBUG_SUBSYSTEM S_LNET
-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/lnet/lib-lnet.h"

 #if  defined(LNET_ROUTER)

--- a/drivers/staging/lustre/lnet/lnet/router_proc.c
+++ b/drivers/staging/lustre/lnet/lnet/router_proc.c
@ -22,8 +22,8 @@
 */

 #define DEBUG_SUBSYSTEM S_LNET
-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/lnet/lib-lnet.h"

 #if  defined(LNET_ROUTER)

--- a/drivers/staging/lustre/lnet/selftest/conctl.c
+++ b/drivers/staging/lustre/lnet/selftest/conctl.c
@ -40,9 +40,9 @@
 * Author: Liang Zhen <liangzhen@clusterfs.com>
 */

-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lib-lnet.h>
-#include <linux/lnet/lnetst.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/lnet/lib-lnet.h"
+#include "../../include/linux/lnet/lnetst.h"
 #include "console.h"

 int
--- a/drivers/staging/lustre/lnet/selftest/conrpc.c
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.c
@ -41,8 +41,8 @@
 */


-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/lnet/lib-lnet.h"
 #include "timer.h"
 #include "conrpc.h"
 #include "console.h"
--- a/drivers/staging/lustre/lnet/selftest/conrpc.h
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.h
@ -43,10 +43,10 @@
 #ifndef __LST_CONRPC_H__
 #define __LST_CONRPC_H__

-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lnet.h>
-#include <linux/lnet/lib-types.h>
-#include <linux/lnet/lnetst.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/lnet/lnet.h"
+#include "../../include/linux/lnet/lib-types.h"
+#include "../../include/linux/lnet/lnetst.h"
 #include "rpc.h"
 #include "selftest.h"

--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@ -41,8 +41,8 @@
 */


-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lib-lnet.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/lnet/lib-lnet.h"
 #include "console.h"
 #include "conrpc.h"

--- a/drivers/staging/lustre/lnet/selftest/console.h
+++ b/drivers/staging/lustre/lnet/selftest/console.h
@ -44,10 +44,10 @@
 #define __LST_CONSOLE_H__


-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lnet.h>
-#include <linux/lnet/lib-types.h>
-#include <linux/lnet/lnetst.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/lnet/lnet.h"
+#include "../../include/linux/lnet/lib-types.h"
+#include "../../include/linux/lnet/lnetst.h"
 #include "selftest.h"
 #include "conrpc.h"

--- a/drivers/staging/lustre/lnet/selftest/rpc.h
+++ b/drivers/staging/lustre/lnet/selftest/rpc.h
@ -37,7 +37,7 @@
 #ifndef __SELFTEST_RPC_H__
 #define __SELFTEST_RPC_H__

-#include <linux/lnet/lnetst.h>
+#include "../../include/linux/lnet/lnetst.h"

 /*
 * LST wired structures
--- a/drivers/staging/lustre/lnet/selftest/selftest.h
+++ b/drivers/staging/lustre/lnet/selftest/selftest.h
@ -43,11 +43,11 @@

 #define LNET_ONLY

-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lnet.h>
-#include <linux/lnet/lib-lnet.h>
-#include <linux/lnet/lib-types.h>
-#include <linux/lnet/lnetst.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/lnet/lnet.h"
+#include "../../include/linux/lnet/lib-lnet.h"
+#include "../../include/linux/lnet/lib-types.h"
+#include "../../include/linux/lnet/lnetst.h"

 #include "rpc.h"
 #include "timer.h"
--- a/drivers/staging/lustre/lustre/fid/fid_internal.h
+++ b/drivers/staging/lustre/lustre/fid/fid_internal.h
@ -41,7 +41,7 @@
 #define __FID_INTERNAL_H

 #include <lustre/lustre_idl.h>
-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 /* Functions used internally in module. */
 int seq_client_alloc_super(struct lu_client_seq *seq,
--- a/drivers/staging/lustre/lustre/fid/fid_lib.c
+++ b/drivers/staging/lustre/lustre/fid/fid_lib.c
@ -43,7 +43,7 @@

 #define DEBUG_SUBSYSTEM S_FID

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <linux/module.h>
 #include <lustre/lustre_idl.h>
 #include <lustre_fid.h>
--- a/drivers/staging/lustre/lustre/fid/fid_request.c
+++ b/drivers/staging/lustre/lustre/fid/fid_request.c
@ -42,7 +42,7 @@

 #define DEBUG_SUBSYSTEM S_FID

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <linux/module.h>

 #include <obd.h>
--- a/drivers/staging/lustre/lustre/fid/lproc_fid.c
+++ b/drivers/staging/lustre/lustre/fid/lproc_fid.c
@ -42,8 +42,8 @@

 #define DEBUG_SUBSYSTEM S_FID

-# include <linux/libcfs/libcfs.h>
-# include <linux/module.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include <linux/module.h>

 #include <obd.h>
 #include <obd_class.h>
--- a/drivers/staging/lustre/lustre/fld/fld_cache.c
+++ b/drivers/staging/lustre/lustre/fld/fld_cache.c
@ -43,7 +43,7 @@

 #define DEBUG_SUBSYSTEM S_FLD

-# include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 # include <linux/module.h>
 # include <asm/div64.h>

--- a/drivers/staging/lustre/lustre/fld/fld_internal.h
+++ b/drivers/staging/lustre/lustre/fld/fld_internal.h
@ -44,7 +44,7 @@
 #include <lustre/lustre_idl.h>
 #include <dt_object.h>

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <lustre_req_layout.h>
 #include <lustre_fld.h>

--- a/drivers/staging/lustre/lustre/fld/fld_request.c
+++ b/drivers/staging/lustre/lustre/fld/fld_request.c
@ -42,7 +42,7 @@

 #define DEBUG_SUBSYSTEM S_FLD

-# include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 # include <linux/module.h>
 # include <asm/div64.h>

--- a/drivers/staging/lustre/lustre/fld/lproc_fld.c
+++ b/drivers/staging/lustre/lustre/fld/lproc_fld.c
@ -43,7 +43,7 @@

 #define DEBUG_SUBSYSTEM S_FLD

-# include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 # include <linux/module.h>

 #include <obd.h>
--- a/drivers/staging/lustre/lustre/include/dt_object.h
+++ b/drivers/staging/lustre/lustre/include/dt_object.h
@ -55,7 +55,7 @@
 */
 #include <lu_object.h>

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 struct seq_file;
 struct proc_dir_entry;
--- a/drivers/staging/lustre/lustre/include/interval_tree.h
+++ b/drivers/staging/lustre/lustre/include/interval_tree.h
@ -40,7 +40,7 @@
 #ifndef _INTERVAL_H__
 #define _INTERVAL_H__

-#include <linux/libcfs/libcfs.h>   /* LASSERT. */
+#include "../../include/linux/libcfs/libcfs.h"	/* LASSERT. */

 struct interval_node {
 	struct interval_node   *in_left;
--- a/drivers/staging/lustre/lustre/include/linux/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/linux/lprocfs_status.h
@ -50,7 +50,7 @@
 #include <linux/seq_file.h>
 #include <linux/smp.h>
 #include <linux/rwsem.h>
-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <linux/statfs.h>


--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@ -39,7 +39,7 @@

 #include <linux/fs_struct.h>
 #include <linux/namei.h>
-#include <linux/libcfs/linux/portals_compat25.h>
+#include "../../../include/linux/libcfs/linux/portals_compat25.h"

 #include <linux/lustre_patchless_compat.h>

--- a/drivers/staging/lustre/lustre/include/linux/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/linux/obd_support.h
@ -52,7 +52,7 @@
 #include <linux/swap.h>
 #include <linux/lustre_compat25.h>
 #include <linux/lustre_common.h>
-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <lustre/lustre_idl.h>


--- a/drivers/staging/lustre/lustre/include/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h
@ -44,7 +44,7 @@

 #include <linux/lprocfs_status.h>
 #include <lustre/lustre_idl.h>
-#include <linux/libcfs/params_tree.h>
+#include "../../include/linux/libcfs/params_tree.h"

 struct lprocfs_vars {
 	const char		*name;
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@ -38,7 +38,7 @@
 #define __LUSTRE_LU_OBJECT_H

 #include <stdarg.h>
-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <lustre/lustre_idl.h>
 #include <lu_ref.h>

--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@ -92,7 +92,7 @@
 #define _LUSTRE_IDL_H_

 #if !defined(LPU64)
-#include <linux/libcfs/libcfs.h> /* for LPUX64, etc */
+#include "../../include/linux/libcfs/libcfs.h"	/* for LPUX64, etc */
 #endif

 /* Defn's shared with user-space. */
--- a/drivers/staging/lustre/lustre/include/lustre_disk.h
+++ b/drivers/staging/lustre/lustre/include/lustre_disk.h
@ -48,8 +48,8 @@
 * @{
 */

-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/types.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/lnet/types.h"
 #include <linux/backing-dev.h>

 /****************** on-disk files *********************/
--- a/drivers/staging/lustre/lustre/include/lustre_fid.h
+++ b/drivers/staging/lustre/lustre/include/lustre_fid.h
@ -152,7 +152,7 @@
 *  Even so, the MDT and OST resources are also in different LDLM namespaces.
 */

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <lustre/lustre_idl.h>

 struct lu_env;
--- a/drivers/staging/lustre/lustre/include/lustre_fld.h
+++ b/drivers/staging/lustre/lustre/include/lustre_fld.h
@ -43,7 +43,7 @@
 */

 #include <lustre/lustre_idl.h>
-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 struct lu_client_fld;
 struct lu_server_fld;
--- a/drivers/staging/lustre/lustre/include/lustre_handles.h
+++ b/drivers/staging/lustre/lustre/include/lustre_handles.h
@ -44,7 +44,7 @@

 #include <linux/lustre_handles.h>

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"


 struct portals_handle_ops {
--- a/drivers/staging/lustre/lustre/include/lustre_idmap.h
+++ b/drivers/staging/lustre/lustre/include/lustre_idmap.h
@ -47,7 +47,7 @@
 * @{
 */

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 #define CFS_NGROUPS_PER_BLOCK   ((int)(PAGE_CACHE_SIZE / sizeof(gid_t)))

--- a/drivers/staging/lustre/lustre/include/lustre_lib.h
+++ b/drivers/staging/lustre/lustre/include/lustre_lib.h
@ -46,7 +46,7 @@
 * @{
 */

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <lustre/lustre_idl.h>
 #include <lustre_ver.h>
 #include <lustre_cfg.h>
--- a/drivers/staging/lustre/lustre/include/lustre_mdc.h
+++ b/drivers/staging/lustre/lustre/include/lustre_mdc.h
@ -52,7 +52,7 @@
 #include <linux/dcache.h>
 #include <linux/lustre_intent.h>
 #include <lustre_handles.h>
-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <obd_class.h>
 #include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
--- a/drivers/staging/lustre/lustre/include/lustre_mds.h
+++ b/drivers/staging/lustre/lustre/include/lustre_mds.h
@ -48,7 +48,7 @@
 */

 #include <lustre_handles.h>
-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
 #include <lustre_dlm.h>
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@ -57,9 +57,9 @@

 #include <linux/lustre_net.h>

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 // #include <obd.h>
-#include <linux/lnet/lnet.h>
+#include "../../include/linux/lnet/lnet.h"
 #include <lustre/lustre_idl.h>
 #include <lustre_ha.h>
 #include <lustre_sec.h>
--- a/drivers/staging/lustre/lustre/include/lvfs.h
+++ b/drivers/staging/lustre/lustre/include/lvfs.h
@ -41,10 +41,10 @@

 #define LL_FID_NAMELEN (16 + 1 + 8 + 1)

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <linux/lvfs.h>

-#include <linux/libcfs/lucache.h>
+#include "../../include/linux/libcfs/lucache.h"


 /* lvfs_common.c */
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@ -50,7 +50,7 @@

 #include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
-#include <linux/libcfs/bitmap.h>
+#include "../../include/linux/libcfs/bitmap.h"
 #include <lu_ref.h>
 #include <lustre_export.h>
 #include <lustre_fid.h>
--- a/drivers/staging/lustre/lustre/include/obd_cksum.h
+++ b/drivers/staging/lustre/lustre/include/obd_cksum.h
@ -34,7 +34,7 @@

 #ifndef __OBD_CKSUM
 #define __OBD_CKSUM
-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <lustre/lustre_idl.h>

 static inline unsigned char cksum_obd2cfs(cksum_type_t cksum_type)
--- a/drivers/staging/lustre/lustre/include/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/obd_support.h
@ -37,7 +37,7 @@
 #ifndef _OBD_SUPPORT
 #define _OBD_SUPPORT

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <lvfs.h>
 #include <lprocfs_status.h>

--- a/drivers/staging/lustre/lustre/lclient/glimpse.c
+++ b/drivers/staging/lustre/lustre/lclient/glimpse.c
@ -40,7 +40,7 @@
 *   Author: Oleg Drokin <oleg.drokin@sun.com>
 */

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <obd_class.h>
 #include <obd_support.h>
 #include <obd.h>
--- a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
+++ b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
@ -41,7 +41,7 @@

 #define DEBUG_SUBSYSTEM S_LLITE

-# include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 # include <linux/fs.h>
 # include <linux/sched.h>
 # include <linux/mm.h>
--- a/drivers/staging/lustre/lustre/ldlm/l_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/l_lock.c
@ -35,7 +35,7 @@
 */

 #define DEBUG_SUBSYSTEM S_LDLM
-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 #include <lustre_dlm.h>
 #include <lustre_lib.h>
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
@ -50,7 +50,7 @@
 */

 #define DEBUG_SUBSYSTEM S_LDLM
-# include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 #include <lustre_dlm.h>
 #include <obd_support.h>
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
@ -43,7 +43,7 @@

 #define DEBUG_SUBSYSTEM S_LDLM

-# include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <obd.h>
 #include <obd_class.h>
 #include <lustre_dlm.h>
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
@ -41,8 +41,8 @@

 #define DEBUG_SUBSYSTEM S_LDLM

-# include <linux/libcfs/libcfs.h>
-# include <linux/lustre_intent.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include <linux/lustre_intent.h>

 #include <obd_class.h>
 #include "ldlm_internal.h"
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
@ -41,7 +41,7 @@

 #define DEBUG_SUBSYSTEM S_LDLM

-# include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 #include <lustre_dlm.h>
 #include <obd_class.h>
--- a/drivers/staging/lustre/lustre/libcfs/debug.c
+++ b/drivers/staging/lustre/lustre/libcfs/debug.c
@ -41,7 +41,7 @@

 # define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include "tracefile.h"

 static char debug_file_name[1024];
--- a/drivers/staging/lustre/lustre/libcfs/fail.c
+++ b/drivers/staging/lustre/lustre/libcfs/fail.c
@ -33,7 +33,7 @@
 * Lustre is a trademark of Oracle Corporation, Inc.
 */

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 unsigned long cfs_fail_loc = 0;
 EXPORT_SYMBOL(cfs_fail_loc);
--- a/drivers/staging/lustre/lustre/libcfs/hash.c
+++ b/drivers/staging/lustre/lustre/libcfs/hash.c
@ -107,7 +107,7 @@
 *   table. Also, user can break the iteration by return 1 in callback.
 */

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"
 #include <linux/seq_file.h>

 #if CFS_HASH_DEBUG_LEVEL >= CFS_HASH_DEBUG_1
--- a/drivers/staging/lustre/lustre/libcfs/heap.c
+++ b/drivers/staging/lustre/lustre/libcfs/heap.c
@ -35,7 +35,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 #define CBH_ALLOC(ptr, h)						\
 do {									\
--- a/drivers/staging/lustre/lustre/libcfs/kernel_user_comm.c
+++ b/drivers/staging/lustre/lustre/libcfs/kernel_user_comm.c
@ -42,7 +42,7 @@
 #define DEBUG_SUBSYSTEM S_CLASS
 #define D_KUC D_OTHER

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 /* This is the kernel side (liblustre as well). */

--- a/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c
@ -35,7 +35,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 /** Global CPU partition table */
 struct cfs_cpt_table   *cfs_cpt_table __read_mostly = NULL;
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_lock.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_lock.c
@ -32,7 +32,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"


 /** destroy cpu-partition lock, see libcfs_private.h for more detail */
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_mem.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_mem.c
@ -33,7 +33,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 struct cfs_var_array {
 	unsigned int		va_count;	/* # of buffers */
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
@ -40,7 +40,7 @@
 * Author: Nathan Rutman <nathan.rutman@sun.com>
 */

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 /* Convert a text string to a bitmask */
 int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
@ -35,7 +35,7 @@

 #include <linux/cpu.h>
 #include <linux/sched.h>
-#include <linux/libcfs/libcfs.h>
+#include "../../../include/linux/libcfs/libcfs.h"

 #ifdef CONFIG_SMP

--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
@ -29,8 +29,8 @@

 #include <linux/crypto.h>
 #include <linux/scatterlist.h>
-#include <linux/libcfs/libcfs.h>
-#include <linux/libcfs/linux/linux-crypto.h>
+#include "../../../include/linux/libcfs/libcfs.h"
+#include "../../../include/linux/libcfs/linux/linux-crypto.h"
 /**
 *  Array of  hash algorithm speed in MByte per second
 */
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c
@ -48,7 +48,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
+#include "../../../include/linux/libcfs/libcfs.h"

 /*
 * Implementation of cfs_curproc API (see portals/include/libcfs/curproc.h)
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
@ -55,8 +55,8 @@

 # define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
-#include <linux/libcfs/linux/portals_compat25.h>
+#include "../../../include/linux/libcfs/libcfs.h"
+#include "../../../include/linux/libcfs/linux/portals_compat25.h"

 #include "tracefile.h"

--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
@ -36,7 +36,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
+#include "../../../include/linux/libcfs/libcfs.h"

 #define LNET_MINOR 240

--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c
@ -40,7 +40,7 @@
 #include <linux/fs_struct.h>
 #include <linux/sched.h>

-#include <linux/libcfs/libcfs.h>
+#include "../../../include/linux/libcfs/libcfs.h"

 #if defined(CONFIG_KGDB)
 #include <asm/kgdb.h>
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
@ -61,7 +61,7 @@

 # define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
+#include "../../../include/linux/libcfs/libcfs.h"
 #include <asm/div64.h>
 #include "tracefile.h"

--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c
@ -35,7 +35,7 @@
 */
 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
+#include "../../../include/linux/libcfs/libcfs.h"

 #include <linux/if.h>
 #include <linux/in.h>
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c
@ -37,7 +37,7 @@
 #define DEBUG_SUBSYSTEM S_LNET
 #define LUSTRE_TRACEFILE_PRIVATE

-#include <linux/libcfs/libcfs.h>
+#include "../../../include/linux/libcfs/libcfs.h"
 #include "tracefile.h"

 /* percents to share the total debug memory for each type */
--- a/drivers/staging/lustre/lustre/libcfs/module.c
+++ b/drivers/staging/lustre/lustre/libcfs/module.c
@ -36,10 +36,10 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
-#include <linux/libcfs/libcfs_crypto.h>
-#include <linux/lnet/lib-lnet.h>
-#include <linux/lnet/lnet.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/libcfs/libcfs_crypto.h"
+#include "../../include/linux/lnet/lib-lnet.h"
+#include "../../include/linux/lnet/lnet.h"
 #include "tracefile.h"

 void
--- a/drivers/staging/lustre/lustre/libcfs/nidstrings.c
+++ b/drivers/staging/lustre/lustre/libcfs/nidstrings.c
@ -40,8 +40,8 @@

 #define DEBUG_SUBSYSTEM S_LNET

-#include <linux/libcfs/libcfs.h>
-#include <linux/lnet/lnet.h>
+#include "../../include/linux/libcfs/libcfs.h"
+#include "../../include/linux/lnet/lnet.h"

 /* CAVEAT VENDITOR! Keep the canonical string representation of nets/nids
 * consistent in all conversion functions.  Some code fragments are copied
--- a/drivers/staging/lustre/lustre/libcfs/prng.c
+++ b/drivers/staging/lustre/lustre/libcfs/prng.c
@ -39,7 +39,7 @@
 * algorithm recommended by Marsaglia
 */

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 /*
 From: George Marsaglia <geo@stat.fsu.edu>
--- a/drivers/staging/lustre/lustre/libcfs/tracefile.c
+++ b/drivers/staging/lustre/lustre/libcfs/tracefile.c
@ -44,7 +44,7 @@
 #define LUSTRE_TRACEFILE_PRIVATE
 #include "tracefile.h"

-#include <linux/libcfs/libcfs.h>
+#include "../../include/linux/libcfs/libcfs.h"

 /* XXX move things up to the top, comment */
 union cfs_trace_data_union (*cfs_trace_data[TCD_MAX_TYPES])[NR_CPUS] __cacheline_aligned;
--- a/Показать больше
+++ b/Показать больше