diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-11 20:51:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-11 20:51:16 -0700 |
| commit | 9fdaf8c0b92ab374f8501eb47855776afc928e45 (patch) | |
| tree | 4f35262cda231dabbc56f2b6ff0059e2c072f791 | |
| parent | staging: lnet: ptllnd_wire.h: checkpatch cleanup: whitespace neatening (diff) | |
| download | linux-dev-9fdaf8c0b92ab374f8501eb47855776afc928e45.tar.xz linux-dev-9fdaf8c0b92ab374f8501eb47855776afc928e45.zip | |
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>
141 files changed, 212 insertions, 215 deletions
diff --git a/drivers/staging/lustre/Makefile b/drivers/staging/lustre/Makefile index fb0e0faf0760..95ffe337a80a 100644 --- 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/ diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h index 26b53f6420e5..a8b84ff4ee06 100644 --- 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) diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h index 740bfcd2f09a..c184746cee4c 100644 --- 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 diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h b/drivers/staging/lustre/include/linux/libcfs/linux/kp30.h index a09fed3c6ea8..f7085c402c1e 100644 --- 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 */ diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h index a7bca40e9fb7..d2f7c19cfa36 100644 --- 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> diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h index 2aeff27b1641..261ab80b712c 100644 --- 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 diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h index a386d1b1286b..201932abcd2b 100644 --- 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. diff --git a/drivers/staging/lustre/include/linux/libcfs/lucache.h b/drivers/staging/lustre/include/linux/libcfs/lucache.h index 9668b397f0f6..b5b3c23bf85e 100644 --- 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 * diff --git a/drivers/staging/lustre/include/linux/libcfs/params_tree.h b/drivers/staging/lustre/include/linux/libcfs/params_tree.h index 78a2c4ed4d6c..170d6658299c 100644 --- 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) diff --git a/drivers/staging/lustre/include/linux/lnet/api-support.h b/drivers/staging/lustre/include/linux/lnet/api-support.h index a8d91dbe6060..8f7fa28b517c 100644 --- 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 diff --git a/drivers/staging/lustre/include/linux/lnet/api.h b/drivers/staging/lustre/include/linux/lnet/api.h index e8642e33860d..0b5478c4c47d 100644 --- 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. diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h index 895c6f8f170b..d8c1bf4265f6 100644 --- 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 */ diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h index 6816aa0ab306..970f2d72948e 100644 --- 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)) diff --git a/drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h index d2c0a70f1f7e..d91f2dd1494f 100644 --- 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) diff --git a/drivers/staging/lustre/include/linux/lnet/lnet.h b/drivers/staging/lustre/include/linux/lnet/lnet.h index c532b15d7643..75c0ab9193cc 100644 --- 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) */ diff --git a/drivers/staging/lustre/include/linux/lnet/lnetctl.h b/drivers/staging/lustre/include/linux/lnet/lnetctl.h index cdbcfec121b3..98181d389396 100644 --- 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" diff --git a/drivers/staging/lustre/include/linux/lnet/lnetst.h b/drivers/staging/lustre/include/linux/lnet/lnetst.h index 87fe9ac76a6c..885f708d4031 100644 --- 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 */ diff --git a/drivers/staging/lustre/include/linux/lnet/socklnd.h b/drivers/staging/lustre/include/linux/lnet/socklnd.h index bacc74933a39..389038b122c5 100644 --- 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 diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h index fd6a03451b1d..68d8139a2b11 100644 --- 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 * @{ */ diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h index 109a23932471..256cfc00015b 100644 --- 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 */ diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h index 025cb65ddc70..f14a60ce0916 100644 --- 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) diff --git a/drivers/staging/lustre/lnet/lnet/acceptor.c b/drivers/staging/lustre/lnet/lnet/acceptor.c index 09ea6cb1492c..66e6b2b18c22 100644 --- 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; diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c index cd6792ea24ef..8aa57c99116d 100644 --- 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 diff --git a/drivers/staging/lustre/lnet/lnet/config.c b/drivers/staging/lustre/lnet/lnet/config.c index d97464e95ddb..d39bc4371596 100644 --- 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 */ diff --git a/drivers/staging/lustre/lnet/lnet/lib-eq.c b/drivers/staging/lustre/lnet/lnet/lib-eq.c index d25dcd8ba563..0147440bd14f 100644 --- 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. diff --git a/drivers/staging/lustre/lnet/lnet/lib-md.c b/drivers/staging/lustre/lnet/lnet/lib-md.c index d68c6e0b4f16..1f386e09b530 100644 --- 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 diff --git a/drivers/staging/lustre/lnet/lnet/lib-me.c b/drivers/staging/lustre/lnet/lnet/lib-me.c index 0e422099aa9c..4397e26cd30f 100644 --- 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 diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c index 95bf41fd68fc..da47ae74a6d6 100644 --- 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); diff --git a/drivers/staging/lustre/lnet/lnet/lib-msg.c b/drivers/staging/lustre/lnet/lnet/lib-msg.c index 761f1e12f847..a46ccbf6608f 100644 --- 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) diff --git a/drivers/staging/lustre/lnet/lnet/lib-ptl.c b/drivers/staging/lustre/lnet/lnet/lib-ptl.c index 920df69960a5..74222ec0ae5b 100644 --- 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; diff --git a/drivers/staging/lustre/lnet/lnet/lo.c b/drivers/staging/lustre/lnet/lnet/lo.c index efc798e01934..be31dfc5fa4b 100644 --- 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) diff --git a/drivers/staging/lustre/lnet/lnet/module.c b/drivers/staging/lustre/lnet/lnet/module.c index 3bd42a485a32..e84d59d23ae0 100644 --- 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); diff --git a/drivers/staging/lustre/lnet/lnet/peer.c b/drivers/staging/lustre/lnet/lnet/peer.c index 72802b0404a4..c93ae8510530 100644 --- 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) diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c index 53d1c7e4f59d..9ee8c9758fc7 100644 --- 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) diff --git a/drivers/staging/lustre/lnet/lnet/router_proc.c b/drivers/staging/lustre/lnet/lnet/router_proc.c index 0cbd9fc98e07..414a9919b9b1 100644 --- 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) diff --git a/drivers/staging/lustre/lnet/selftest/conctl.c b/drivers/staging/lustre/lnet/selftest/conctl.c index 68e1a171209c..3df1a0d85443 100644 --- 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 diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.c b/drivers/staging/lustre/lnet/selftest/conrpc.c index 8d1eea4cef6f..ebb8f34959ef 100644 --- 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" diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.h b/drivers/staging/lustre/lnet/selftest/conrpc.h index 9aba24a2eab9..59f0097c6ec9 100644 --- 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" diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c index 2aeebbfdc0e3..01670a6fbaeb 100644 --- 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" diff --git a/drivers/staging/lustre/lnet/selftest/console.h b/drivers/staging/lustre/lnet/selftest/console.h index 393dc0f64109..0e2e3263832f 100644 --- 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" diff --git a/drivers/staging/lustre/lnet/selftest/rpc.h b/drivers/staging/lustre/lnet/selftest/rpc.h index b905d49a351f..fbeb75fe5922 100644 --- 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 diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h index f4806a6bc942..7bc616602b11 100644 --- 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" diff --git a/drivers/staging/lustre/lustre/fid/fid_internal.h b/drivers/staging/lustre/lustre/fid/fid_internal.h index 1dbe46be0f41..59381d368d9c 100644 --- 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, diff --git a/drivers/staging/lustre/lustre/fid/fid_lib.c b/drivers/staging/lustre/lustre/fid/fid_lib.c index f03afdec027a..a75d4bbf7cbd 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/fid/fid_request.c b/drivers/staging/lustre/lustre/fid/fid_request.c index 3401c9ad42ac..2127ad9b1785 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/fid/lproc_fid.c b/drivers/staging/lustre/lustre/fid/lproc_fid.c index 20078df5f377..3bbcedaceae9 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/fld/fld_cache.c b/drivers/staging/lustre/lustre/fld/fld_cache.c index a06a642f549e..32ec812598cd 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/fld/fld_internal.h b/drivers/staging/lustre/lustre/fld/fld_internal.h index 8661a788f120..1a049b51d865 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/fld/fld_request.c b/drivers/staging/lustre/lustre/fld/fld_request.c index 211430d541c1..dfee6a461fa9 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/fld/lproc_fld.c b/drivers/staging/lustre/lustre/fld/lproc_fld.c index 8b366356f77f..208a81e69726 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/include/dt_object.h b/drivers/staging/lustre/lustre/include/dt_object.h index 9b7921d1dea8..7c6bbab50f8a 100644 --- 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; diff --git a/drivers/staging/lustre/lustre/include/interval_tree.h b/drivers/staging/lustre/lustre/include/interval_tree.h index dfdb8aa4e035..1815783edae6 100644 --- 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; diff --git a/drivers/staging/lustre/lustre/include/linux/lprocfs_status.h b/drivers/staging/lustre/lustre/include/linux/lprocfs_status.h index 4bcc4dcca3da..d1e1a185ae1c 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h index 81cc7a0134bb..d9d7ebb5683f 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/include/linux/obd_support.h b/drivers/staging/lustre/lustre/include/linux/obd_support.h index 9166503408aa..db7a8bacd491 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h b/drivers/staging/lustre/lustre/include/lprocfs_status.h index 1b7f6a9bf62c..2f86eb7976eb 100644 --- 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; diff --git a/drivers/staging/lustre/lustre/include/lu_object.h b/drivers/staging/lustre/lustre/include/lu_object.h index 98149f5da153..4fe1611ff703 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h index 83014c9fea65..3d5bec75564c 100644 --- 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. */ diff --git a/drivers/staging/lustre/lustre/include/lustre_disk.h b/drivers/staging/lustre/lustre/include/lustre_disk.h index ac08164793cb..7f191eed2a81 100644 --- 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 *********************/ diff --git a/drivers/staging/lustre/lustre/include/lustre_fid.h b/drivers/staging/lustre/lustre/include/lustre_fid.h index 5e7b3165a851..5b7333092805 100644 --- 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; diff --git a/drivers/staging/lustre/lustre/include/lustre_fld.h b/drivers/staging/lustre/lustre/include/lustre_fld.h index 550fff587458..365854789f60 100644 --- 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; diff --git a/drivers/staging/lustre/lustre/include/lustre_handles.h b/drivers/staging/lustre/lustre/include/lustre_handles.h index fcd40f33426a..8ae868fdf658 100644 --- 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 { diff --git a/drivers/staging/lustre/lustre/include/lustre_idmap.h b/drivers/staging/lustre/lustre/include/lustre_idmap.h index 2da859691d6a..5624b8bae919 100644 --- 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))) diff --git a/drivers/staging/lustre/lustre/include/lustre_lib.h b/drivers/staging/lustre/lustre/include/lustre_lib.h index 3c26bbdc44b7..60edf5a59918 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/include/lustre_mdc.h b/drivers/staging/lustre/lustre/include/lustre_mdc.h index 66765d4d201d..1efcf838b197 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/include/lustre_mds.h b/drivers/staging/lustre/lustre/include/lustre_mds.h index b386f87471e3..9a1575013178 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h index b837d34f0b4d..fd8d943c2848 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/include/lvfs.h b/drivers/staging/lustre/lustre/include/lvfs.h index 28f1a6b76f73..156481c2a911 100644 --- 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 */ diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h index d5c4613f182d..e2f33d14e0e4 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/include/obd_cksum.h b/drivers/staging/lustre/lustre/include/obd_cksum.h index 5f740f1743ca..d2e0d4c45e6b 100644 --- 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) diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h index cc5af509b261..f9a120318963 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/lclient/glimpse.c b/drivers/staging/lustre/lustre/lclient/glimpse.c index a658116daf2b..8dd4b22eff31 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c index 08d6fbdf6ed9..7791d3d3bca4 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/ldlm/l_lock.c b/drivers/staging/lustre/lustre/ldlm/l_lock.c index 32f4d52b5362..ba774c4d991e 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c index bde3a82ce0dd..53cdbb8e45ea 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c index d8ad808fc8dc..8900968a2c03 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c index 1b3f5c1eb808..16a1020b9835 100644 --- 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" diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c index 7e63cf355cd9..05c53fbf7a3d 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/libcfs/debug.c b/drivers/staging/lustre/lustre/libcfs/debug.c index 1e4c5ad26157..2373ccdba9b3 100644 --- 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]; diff --git a/drivers/staging/lustre/lustre/libcfs/fail.c b/drivers/staging/lustre/lustre/libcfs/fail.c index f63eac98d54b..1bf9c90b4789 100644 --- 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); diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c b/drivers/staging/lustre/lustre/libcfs/hash.c index 6d2b455d1be4..5dde79418297 100644 --- 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 diff --git a/drivers/staging/lustre/lustre/libcfs/heap.c b/drivers/staging/lustre/lustre/libcfs/heap.c index 147e4fe4762d..bf6d0b91c35f 100644 --- 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 { \ diff --git a/drivers/staging/lustre/lustre/libcfs/kernel_user_comm.c b/drivers/staging/lustre/lustre/libcfs/kernel_user_comm.c index b6ddc998f750..e2aa637abcf9 100644 --- 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). */ diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c b/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c index a1a7bf44cccf..dbb81b6cc200 100644 --- 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; diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_lock.c b/drivers/staging/lustre/lustre/libcfs/libcfs_lock.c index a2ce4c0eb3dc..2c199c7259fe 100644 --- 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 */ diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_mem.c b/drivers/staging/lustre/lustre/libcfs/libcfs_mem.c index feab537c728c..1debdda72e72 100644 --- 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 */ diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c index ed0a6b531058..fb88733607a9 100644 --- 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), diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c index fc21210d77ec..224c65b5ce4e 100644 --- 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 diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c index b6c79bc177ad..048a4f28f900 100644 --- 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 */ diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c index bd301ce02255..d71ad5ed1f6d 100644 --- 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) diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c index cc565b1fb994..ca2faa68cb5a 100644 --- 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" diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c index 581b4728c6ca..ccadf6581cc4 100644 --- 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 diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c index 9a40d1415a65..342ee36f64c6 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c index e947b9128c58..264dc8b34648 100644 --- 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" diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c index e52e33aab55b..eb14dfd4b0f5 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c index 162beee24a73..f8dadd2f5607 100644 --- 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 */ diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c index b16ee08fe742..d138368e632d 100644 --- 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 diff --git a/drivers/staging/lustre/lustre/libcfs/nidstrings.c b/drivers/staging/lustre/lustre/libcfs/nidstrings.c index 4fc7b452f3ba..47c239f22ba8 100644 --- 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 diff --git a/drivers/staging/lustre/lustre/libcfs/prng.c b/drivers/staging/lustre/lustre/libcfs/prng.c index f87e9e516546..4147664ff57a 100644 --- 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> diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.c b/drivers/staging/lustre/lustre/libcfs/tracefile.c index 07845e844243..0569bf8c75f3 100644 --- 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; diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.h b/drivers/staging/lustre/lustre/libcfs/tracefile.h index 55ecfc9f201b..8df4af36c91d 100644 --- a/drivers/staging/lustre/lustre/libcfs/tracefile.h +++ b/drivers/staging/lustre/lustre/libcfs/tracefile.h @@ -37,7 +37,7 @@ #ifndef __LIBCFS_TRACEFILE_H__ #define __LIBCFS_TRACEFILE_H__ -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include "linux/linux-tracefile.h" diff --git a/drivers/staging/lustre/lustre/libcfs/upcall_cache.c b/drivers/staging/lustre/lustre/libcfs/upcall_cache.c index 8085e32e5e7a..ab5c763aed94 100644 --- a/drivers/staging/lustre/lustre/libcfs/upcall_cache.c +++ b/drivers/staging/lustre/lustre/libcfs/upcall_cache.c @@ -39,7 +39,7 @@ */ #define DEBUG_SUBSYSTEM S_SEC -#include <linux/libcfs/lucache.h> +#include "../../include/linux/libcfs/lucache.h" static struct upcall_cache_entry *alloc_entry(struct upcall_cache *cache, __u64 key, void *args) diff --git a/drivers/staging/lustre/lustre/libcfs/workitem.c b/drivers/staging/lustre/lustre/libcfs/workitem.c index 0a03bf7ba3eb..65629579bd7d 100644 --- a/drivers/staging/lustre/lustre/libcfs/workitem.c +++ b/drivers/staging/lustre/lustre/libcfs/workitem.c @@ -41,7 +41,7 @@ #define DEBUG_SUBSYSTEM S_LNET -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #define CFS_WS_NAME_LEN 16 diff --git a/drivers/staging/lustre/lustre/llite/vvp_object.c b/drivers/staging/lustre/lustre/llite/vvp_object.c index 65b6db1b71b4..369a3859bd0c 100644 --- a/drivers/staging/lustre/lustre/llite/vvp_object.c +++ b/drivers/staging/lustre/lustre/llite/vvp_object.c @@ -41,7 +41,7 @@ #define DEBUG_SUBSYSTEM S_LLITE -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd.h> #include <lustre_lite.h> diff --git a/drivers/staging/lustre/lustre/lov/lov_cl_internal.h b/drivers/staging/lustre/lustre/lov/lov_cl_internal.h index 3965d5e4e725..7f8c5d3c3753 100644 --- a/drivers/staging/lustre/lustre/lov/lov_cl_internal.h +++ b/drivers/staging/lustre/lustre/lov/lov_cl_internal.h @@ -46,7 +46,7 @@ #ifndef LOV_CL_INTERNAL_H #define LOV_CL_INTERNAL_H -# include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd.h> #include <cl_object.h> diff --git a/drivers/staging/lustre/lustre/lov/lov_ea.c b/drivers/staging/lustre/lustre/lov/lov_ea.c index a0c148e31f69..c2206624277f 100644 --- a/drivers/staging/lustre/lustre/lov/lov_ea.c +++ b/drivers/staging/lustre/lustre/lov/lov_ea.c @@ -41,7 +41,7 @@ #define DEBUG_SUBSYSTEM S_LOV #include <asm/div64.h> -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_class.h> #include <lustre/lustre_idl.h> diff --git a/drivers/staging/lustre/lustre/lov/lov_merge.c b/drivers/staging/lustre/lustre/lov/lov_merge.c index da959e901371..61103164cb56 100644 --- a/drivers/staging/lustre/lustre/lov/lov_merge.c +++ b/drivers/staging/lustre/lustre/lov/lov_merge.c @@ -36,7 +36,7 @@ #define DEBUG_SUBSYSTEM S_LOV -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_class.h> #include "lov_internal.h" diff --git a/drivers/staging/lustre/lustre/lov/lov_obd.c b/drivers/staging/lustre/lustre/lov/lov_obd.c index 2d843b1c1ded..6806cb59fe15 100644 --- a/drivers/staging/lustre/lustre/lov/lov_obd.c +++ b/drivers/staging/lustre/lustre/lov/lov_obd.c @@ -42,7 +42,7 @@ */ #define DEBUG_SUBSYSTEM S_LOV -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_support.h> #include <lustre_lib.h> diff --git a/drivers/staging/lustre/lustre/lov/lov_offset.c b/drivers/staging/lustre/lustre/lov/lov_offset.c index 379568f8245c..6003f9b66ae7 100644 --- a/drivers/staging/lustre/lustre/lov/lov_offset.c +++ b/drivers/staging/lustre/lustre/lov/lov_offset.c @@ -36,7 +36,7 @@ #define DEBUG_SUBSYSTEM S_LOV -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_class.h> diff --git a/drivers/staging/lustre/lustre/lov/lov_pool.c b/drivers/staging/lustre/lustre/lov/lov_pool.c index 3bda0c1f3c19..77918e4a736b 100644 --- a/drivers/staging/lustre/lustre/lov/lov_pool.c +++ b/drivers/staging/lustre/lustre/lov/lov_pool.c @@ -44,7 +44,7 @@ #define DEBUG_SUBSYSTEM S_LOV -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd.h> #include "lov_internal.h" diff --git a/drivers/staging/lustre/lustre/lov/lov_request.c b/drivers/staging/lustre/lustre/lov/lov_request.c index 984f4c3e5f04..9186662568b5 100644 --- a/drivers/staging/lustre/lustre/lov/lov_request.c +++ b/drivers/staging/lustre/lustre/lov/lov_request.c @@ -36,7 +36,7 @@ #define DEBUG_SUBSYSTEM S_LOV -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_class.h> #include <obd_ost.h> diff --git a/drivers/staging/lustre/lustre/lvfs/fsfilt.c b/drivers/staging/lustre/lustre/lvfs/fsfilt.c index 0d6ed69ddb22..1c0fc24e6bdc 100644 --- a/drivers/staging/lustre/lustre/lvfs/fsfilt.c +++ b/drivers/staging/lustre/lustre/lvfs/fsfilt.c @@ -38,7 +38,7 @@ #include <linux/module.h> #include <linux/kmod.h> #include <linux/slab.h> -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <lustre_fsfilt.h> LIST_HEAD(fsfilt_types); diff --git a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c index 374a9b78e1d2..e616873933f4 100644 --- a/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c +++ b/drivers/staging/lustre/lustre/lvfs/lvfs_linux.c @@ -45,8 +45,8 @@ #include <linux/slab.h> #include <linux/pagemap.h> #include <linux/quotaops.h> -#include <linux/libcfs/libcfs.h> #include <linux/module.h> +#include "../../include/linux/libcfs/libcfs.h" #include <linux/lustre_compat25.h> #include <lvfs.h> diff --git a/drivers/staging/lustre/lustre/mgc/mgc_internal.h b/drivers/staging/lustre/lustre/mgc/mgc_internal.h index 73b454898844..648b44323195 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_internal.h +++ b/drivers/staging/lustre/lustre/mgc/mgc_internal.h @@ -37,7 +37,7 @@ #ifndef _MGC_INTERNAL_H #define _MGC_INTERNAL_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> diff --git a/drivers/staging/lustre/lustre/obdclass/cl_object.c b/drivers/staging/lustre/lustre/obdclass/cl_object.c index 41cbc95b916e..229465980e0b 100644 --- a/drivers/staging/lustre/lustre/obdclass/cl_object.c +++ b/drivers/staging/lustre/lustre/obdclass/cl_object.c @@ -51,13 +51,13 @@ #define DEBUG_SUBSYSTEM S_CLASS -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" /* class_put_type() */ #include <obd_class.h> #include <obd_support.h> #include <lustre_fid.h> #include <linux/list.h> -#include <linux/libcfs/libcfs_hash.h> /* for cfs_hash stuff */ +#include "../../include/linux/libcfs/libcfs_hash.h" /* for cfs_hash stuff */ #include <cl_object.h> #include "cl_internal.h" diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c index 1b616e4fe140..5e21dd5cfd32 100644 --- a/drivers/staging/lustre/lustre/obdclass/cl_page.c +++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c @@ -40,7 +40,7 @@ #define DEBUG_SUBSYSTEM S_CLASS -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_class.h> #include <obd_support.h> #include <linux/list.h> diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c index dde04b767a6d..2eadaa91daa2 100644 --- a/drivers/staging/lustre/lustre/obdclass/class_obd.c +++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c @@ -39,7 +39,7 @@ #include <obd_support.h> #include <obd_class.h> -#include <linux/lnet/lnetctl.h> +#include "../../include/linux/lnet/lnetctl.h" #include <lustre_debug.h> #include <lprocfs_status.h> #include <lustre/lustre_build_version.h> diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c index bdf2eed2952a..8fcfd8c70bbc 100644 --- a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c +++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c @@ -65,10 +65,10 @@ #include <linux/miscdevice.h> #include <linux/seq_file.h> -#include <linux/libcfs/libcfs.h> +#include "../../../include/linux/libcfs/libcfs.h" +#include "../../../include/linux/lnet/lnetctl.h" #include <obd_support.h> #include <obd_class.h> -#include <linux/lnet/lnetctl.h> #include <lprocfs_status.h> #include <lustre_ver.h> #include <lustre/lustre_build_version.h> diff --git a/drivers/staging/lustre/lustre/obdclass/lu_object.c b/drivers/staging/lustre/lustre/obdclass/lu_object.c index 92e8a15a5e5d..376893c374c8 100644 --- a/drivers/staging/lustre/lustre/obdclass/lu_object.c +++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c @@ -44,12 +44,12 @@ #define DEBUG_SUBSYSTEM S_CLASS -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" # include <linux/module.h> /* hash_long() */ -#include <linux/libcfs/libcfs_hash.h> +#include "../../include/linux/libcfs/libcfs_hash.h" #include <obd_class.h> #include <obd_support.h> #include <lustre_disk.h> diff --git a/drivers/staging/lustre/lustre/obdclass/lu_ref.c b/drivers/staging/lustre/lustre/obdclass/lu_ref.c index 23a76f158356..b29ca63d85b2 100644 --- a/drivers/staging/lustre/lustre/obdclass/lu_ref.c +++ b/drivers/staging/lustre/lustre/obdclass/lu_ref.c @@ -42,7 +42,7 @@ #define DEBUG_SUBSYSTEM S_CLASS -# include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd.h> #include <obd_class.h> diff --git a/drivers/staging/lustre/lustre/obdclass/lu_ucred.c b/drivers/staging/lustre/lustre/obdclass/lu_ucred.c index e23e545b0d66..f5bd9cca258d 100644 --- a/drivers/staging/lustre/lustre/obdclass/lu_ucred.c +++ b/drivers/staging/lustre/lustre/obdclass/lu_ucred.c @@ -44,7 +44,7 @@ #define DEBUG_SUBSYSTEM S_CLASS -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_support.h> #include <lu_object.h> #include <md_object.h> diff --git a/drivers/staging/lustre/lustre/obdclass/uuid.c b/drivers/staging/lustre/lustre/obdclass/uuid.c index e87a19900770..344a04711df4 100644 --- a/drivers/staging/lustre/lustre/obdclass/uuid.c +++ b/drivers/staging/lustre/lustre/obdclass/uuid.c @@ -38,7 +38,7 @@ #define DEBUG_SUBSYSTEM S_CLASS -# include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_support.h> #include <obd_class.h> diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c index cdc46719bbd4..59b8f648a077 100644 --- a/drivers/staging/lustre/lustre/obdecho/echo_client.c +++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c @@ -35,7 +35,7 @@ */ #define DEBUG_SUBSYSTEM S_ECHO -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd.h> #include <obd_support.h> diff --git a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h index e74b7bb9776c..9fe79f30d936 100644 --- a/drivers/staging/lustre/lustre/osc/osc_cl_internal.h +++ b/drivers/staging/lustre/lustre/osc/osc_cl_internal.h @@ -46,7 +46,7 @@ #ifndef OSC_CL_INTERNAL_H #define OSC_CL_INTERNAL_H -# include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd.h> /* osc_build_res_name() */ diff --git a/drivers/staging/lustre/lustre/osc/osc_lock.c b/drivers/staging/lustre/lustre/osc/osc_lock.c index a46129bec17a..be677ddeed59 100644 --- a/drivers/staging/lustre/lustre/osc/osc_lock.c +++ b/drivers/staging/lustre/lustre/osc/osc_lock.c @@ -40,7 +40,7 @@ #define DEBUG_SUBSYSTEM S_OSC -# include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" /* fid_build_reg_res_name() */ #include <lustre_fid.h> diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c index 90e8912dbeb5..6749bc415c9f 100644 --- a/drivers/staging/lustre/lustre/osc/osc_request.c +++ b/drivers/staging/lustre/lustre/osc/osc_request.c @@ -36,7 +36,7 @@ #define DEBUG_SUBSYSTEM S_OSC -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <lustre_dlm.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/errno.c b/drivers/staging/lustre/lustre/ptlrpc/errno.c index 1c1006333960..79734cd3693e 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/errno.c +++ b/drivers/staging/lustre/lustre/ptlrpc/errno.c @@ -25,7 +25,7 @@ * Copyright (c) 2013, Intel Corporation. */ -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <lustre/lustre_errno.h> /* diff --git a/drivers/staging/lustre/lustre/ptlrpc/events.c b/drivers/staging/lustre/lustre/ptlrpc/events.c index 209fcc144298..fcdba92883c8 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/events.c +++ b/drivers/staging/lustre/lustre/ptlrpc/events.c @@ -36,7 +36,7 @@ #define DEBUG_SUBSYSTEM S_RPC -# include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" # ifdef __mips64__ # include <linux/kernel.h> # endif diff --git a/drivers/staging/lustre/lustre/ptlrpc/llog_client.c b/drivers/staging/lustre/lustre/ptlrpc/llog_client.c index ab084541fddb..768a150c0d92 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/llog_client.c +++ b/drivers/staging/lustre/lustre/ptlrpc/llog_client.c @@ -42,7 +42,7 @@ #define DEBUG_SUBSYSTEM S_LOG -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_class.h> #include <lustre_log.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/llog_net.c b/drivers/staging/lustre/lustre/ptlrpc/llog_net.c index 17c06a32df62..da580eda7ce1 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/llog_net.c +++ b/drivers/staging/lustre/lustre/ptlrpc/llog_net.c @@ -46,7 +46,7 @@ #define DEBUG_SUBSYSTEM S_LOG -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_class.h> #include <lustre_log.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs.c b/drivers/staging/lustre/lustre/ptlrpc/nrs.c index 12151aa2a1e5..8db5c0acb229 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/nrs.c +++ b/drivers/staging/lustre/lustre/ptlrpc/nrs.c @@ -44,7 +44,7 @@ #include <obd_class.h> #include <lustre_net.h> #include <lprocfs_status.h> -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include "ptlrpc_internal.h" /* XXX: This is just for liblustre. Remove the #if defined directive when the diff --git a/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c b/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c index 7d3ee9706c9b..cbf30c44b857 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c +++ b/drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c @@ -49,7 +49,7 @@ #define DEBUG_SUBSYSTEM S_RPC #include <obd_support.h> #include <obd_class.h> -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include "ptlrpc_internal.h" /** diff --git a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c index cddeeb6bb23d..056c290c839c 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c +++ b/drivers/staging/lustre/lustre/ptlrpc/pack_generic.c @@ -44,7 +44,7 @@ #define DEBUG_SUBSYSTEM S_RPC -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_support.h> #include <obd_class.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c b/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c index ca734ce079c1..ea636f9026b5 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c +++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c @@ -55,7 +55,7 @@ #define DEBUG_SUBSYSTEM S_RPC -# include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <lustre_net.h> # include <lustre_lib.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/recover.c b/drivers/staging/lustre/lustre/ptlrpc/recover.c index 9cec8a649dc3..bd968f070fc9 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/recover.c +++ b/drivers/staging/lustre/lustre/ptlrpc/recover.c @@ -39,7 +39,7 @@ */ #define DEBUG_SUBSYSTEM S_RPC -# include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_support.h> #include <lustre_ha.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec.c b/drivers/staging/lustre/lustre/ptlrpc/sec.c index 28ac824a73fb..054b1da94cf4 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec.c @@ -40,7 +40,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <linux/crypto.h> #include <linux/key.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c index 9d51badea73d..f41ddbae7752 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c @@ -40,7 +40,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <linux/crypto.h> #include <obd.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c index 231656ed7660..585d332c674e 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c @@ -36,7 +36,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <linux/crypto.h> #include <linux/key.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c b/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c index d2eb20eb56db..e63923fd343c 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_gc.c @@ -40,7 +40,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <obd_support.h> #include <obd_class.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c b/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c index 1928bf57222f..095d6e79fa0e 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c @@ -38,7 +38,7 @@ #define DEBUG_SUBSYSTEM S_SEC -#include <linux/libcfs/libcfs.h> +#include "../../include/linux/libcfs/libcfs.h" #include <linux/crypto.h> #include <obd.h> diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c index 214daa2e4cfa..bdb9f576576d 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/service.c +++ b/drivers/staging/lustre/lustre/ptlrpc/service.c @@ -39,7 +39,7 @@ #include <obd_class.h> #include <lustre_net.h> #include <lu_object.h> -#include <linux/lnet/types.h> +#include "../../include/linux/lnet/types.h" #include "ptlrpc_internal.h" /* The following are visible and mutable through /sys/module/ptlrpc */ |