From a3b9617c740f063a198bd6d81b7860af5799f755 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Wed, 10 Jun 2015 19:55:18 -0400 Subject: [PATCH] LU-6245 tests: remove libcfs.h from lctl code Since user land libcfs is mostly gone libcfs.h can be removed from the code that is used by lctl. Change-Id: Ieb2f3873177dfc2c7fa3036568e263f4ba27e1ce Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/15208 Reviewed-by: frank zago Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- libcfs/include/libcfs/user-time.h | 4 ---- lnet/utils/debug.c | 17 ++++++++++++++++- lnet/utils/portals.c | 4 +++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/libcfs/include/libcfs/user-time.h b/libcfs/include/libcfs/user-time.h index ae8f8ea..bf0fdd9 100644 --- a/libcfs/include/libcfs/user-time.h +++ b/libcfs/include/libcfs/user-time.h @@ -41,10 +41,6 @@ #ifndef __LIBCFS_USER_TIME_H__ #define __LIBCFS_USER_TIME_H__ -#ifndef __LIBCFS_LIBCFS_H__ -#error Do not #include this file directly. #include instead -#endif - /* Portable time API */ /* diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c index a54e514..2abc044 100644 --- a/lnet/utils/debug.c +++ b/lnet/utils/debug.c @@ -43,9 +43,24 @@ #define _GNU_SOURCE #endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include + +#include + #include +#include +#include #include static char rawbuf[8192]; diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c index bc06446..9908a98 100644 --- a/lnet/utils/portals.c +++ b/lnet/utils/portals.c @@ -33,9 +33,11 @@ #include #include #include -#include + #include #include +#include +#include #include #include #include -- 1.8.3.1