From 1f28db699f7cf8ac67f687410ba83c0eb202cc7f Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb@suse.com> Date: Mon, 21 May 2018 14:35:13 +1000 Subject: [PATCH] staging: lustre: don't include libcfs.h in lnet/lib-lnet.h We want to be more focused in what is included where. So we remove libcfs.h from where it isn't needed. Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h | 1 + drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h | 3 +++ drivers/staging/lustre/include/linux/lnet/lib-lnet.h | 6 +++++- drivers/staging/lustre/lnet/lnet/config.c | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h index 07f7d306ba9aa..17534a76362ae 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h @@ -39,6 +39,7 @@ #ifndef __LIBCFS_DEBUG_H__ #define __LIBCFS_DEBUG_H__ +#include <linux/limits.h> #include <uapi/linux/lnet/libcfs_debug.h> /* diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h index d6fc3164e7e7c..a0c3413f4e6e4 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h @@ -33,6 +33,9 @@ #ifndef _LIBCFS_FAIL_H #define _LIBCFS_FAIL_H +#include <linux/sched.h> +#include <linux/wait.h> + extern unsigned long cfs_fail_loc; extern unsigned int cfs_fail_val; extern int cfs_fail_err; diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h index cc0150ef84fef..973c17a1c4a15 100644 --- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h +++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h @@ -36,7 +36,11 @@ #ifndef __LNET_LIB_LNET_H__ #define __LNET_LIB_LNET_H__ -#include <linux/libcfs/libcfs_all.h> +#include <linux/libcfs/libcfs.h> +#include <linux/libcfs/libcfs_cpu.h> +#include <linux/libcfs/libcfs_string.h> +#include <net/sock.h> + #include <linux/lnet/api.h> #include <linux/lnet/lib-types.h> #include <uapi/linux/lnet/lnet-dlc.h> diff --git a/drivers/staging/lustre/lnet/lnet/config.c b/drivers/staging/lustre/lnet/lnet/config.c index 0aea268a4f1c0..55ecc1998b7e2 100644 --- a/drivers/staging/lustre/lnet/lnet/config.c +++ b/drivers/staging/lustre/lnet/lnet/config.c @@ -34,6 +34,7 @@ #define DEBUG_SUBSYSTEM S_LNET #include <linux/nsproxy.h> #include <net/net_namespace.h> +#include <linux/ctype.h> #include <linux/lnet/lib-lnet.h> struct lnet_text_buf { /* tmp struct for parsing routes */ -- 2.30.2