From a3b9617c740f063a198bd6d81b7860af5799f755 Mon Sep 17 00:00:00 2001
From: James Simmons <uja.ornl@yahoo.com>
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 <uja.ornl@yahoo.com>
Reviewed-on: http://review.whamcloud.com/15208
Reviewed-by: frank zago <fzago@cray.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
 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 <libcfs/libcfs.h> 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 <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <time.h>
 #include <unistd.h>
-#include <libcfs/libcfs.h>
+
+#include <linux/types.h>
+
 #include <libcfs/util/ioctl.h>
+#include <libcfs/user-time.h>
+#include <libcfs/libcfs_debug.h>
 #include <lnet/lnetctl.h>
 
 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 <sys/time.h>
 #include <time.h>
 #include <linux/types.h>
-#include <libcfs/libcfs.h>
+
 #include <libcfs/util/string.h>
 #include <libcfs/util/ioctl.h>
+#include <libcfs/user-time.h>
+#include <libcfs/libcfs_debug.h>
 #include <lnet/lnetctl.h>
 #include <lnet/socklnd.h>
 #include <lnet/lnet.h>
-- 
1.8.3.1