staging: lustre: libcfs: add include path to Makefile

Rationalize include paths in the libcfs source code files. Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2026-05-05 06:18:45 -04:00 · 2017-08-19 22:26:56 -04:00
parent 95884b8a08
commit f9f6b24bc5
21 changed files with 27 additions and 24 deletions
--- a/drivers/staging/lustre/lnet/libcfs/Makefile
+++ b/drivers/staging/lustre/lnet/libcfs/Makefile
@@ -1,3 +1,6 @@
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include
+subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include
+
 obj-$(CONFIG_LNET) += libcfs.o

 libcfs-linux-objs := linux-tracefile.o linux-debug.o
--- a/drivers/staging/lustre/lnet/libcfs/debug.c
+++ b/drivers/staging/lustre/lnet/libcfs/debug.c
@@ -37,7 +37,7 @@

 # define DEBUG_SUBSYSTEM S_LNET

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

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

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

 unsigned long cfs_fail_loc;
 EXPORT_SYMBOL(cfs_fail_loc);
--- a/drivers/staging/lustre/lnet/libcfs/hash.c
+++ b/drivers/staging/lustre/lnet/libcfs/hash.c
@@ -105,7 +105,7 @@
 #include <linux/seq_file.h>
 #include <linux/log2.h>

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

 #if CFS_HASH_DEBUG_LEVEL >= CFS_HASH_DEBUG_1
 static unsigned int warn_on_depth = 8;
--- a/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
+++ b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
@@ -30,7 +30,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

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

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

 #define DEBUG_SUBSYSTEM S_LNET

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

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

 #define DEBUG_SUBSYSTEM S_LNET

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

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

-#include "../../include/linux/libcfs/libcfs.h"
+#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/lnet/libcfs/linux/linux-cpu.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
@@ -31,7 +31,7 @@

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

 #ifdef CONFIG_SMP

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

 #include <crypto/hash.h>
 #include <linux/scatterlist.h>
-#include "../../../include/linux/libcfs/libcfs.h"
-#include "../../../include/linux/libcfs/libcfs_crypto.h"
+#include <linux/libcfs/libcfs.h>
+#include <linux/libcfs/libcfs_crypto.h>
 #include "linux-crypto.h"

 /**
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
@@ -44,7 +44,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

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

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

 # define DEBUG_SUBSYSTEM S_LNET

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

 #include "../tracefile.h"

--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>

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

 void *libcfs_kvzalloc(size_t size, gfp_t flags)
 {
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
@@ -32,7 +32,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

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

 #define LNET_MINOR 240

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

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

 #if defined(CONFIG_KGDB)
 #include <linux/kgdb.h>
--- a/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
+++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
@@ -33,7 +33,7 @@
 #define DEBUG_SUBSYSTEM S_LNET
 #define LUSTRE_TRACEFILE_PRIVATE

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

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

 # define DEBUG_SUBSYSTEM S_LNET

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

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

 static struct dentry *lnet_debugfs_root;
--- a/drivers/staging/lustre/lnet/libcfs/prng.c
+++ b/drivers/staging/lustre/lnet/libcfs/prng.c
@@ -35,7 +35,7 @@
 * algorithm recommended by Marsaglia
 */

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

 /*
 * From: George Marsaglia <geo@stat.fsu.edu>
--- a/drivers/staging/lustre/lnet/libcfs/tracefile.c
+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.c
@@ -40,7 +40,7 @@
 #define pr_fmt(fmt) "Lustre: " fmt
 #include "tracefile.h"

-#include "../../include/linux/libcfs/libcfs.h"
+#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/drivers/staging/lustre/lnet/libcfs/tracefile.h
+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.h
@@ -33,7 +33,7 @@
 #ifndef __LIBCFS_TRACEFILE_H__
 #define __LIBCFS_TRACEFILE_H__

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

 enum cfs_trace_buf_type {
 	CFS_TCD_TYPE_PROC = 0,
--- a/drivers/staging/lustre/lnet/libcfs/workitem.c
+++ b/drivers/staging/lustre/lnet/libcfs/workitem.c
@@ -37,7 +37,7 @@

 #define DEBUG_SUBSYSTEM S_LNET

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

 #define CFS_WS_NAME_LEN	 16