bz-13516

diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c
index 58ef681..a69d967 100644 (file)
--- a/lnet/libcfs/debug.c
+++ b/lnet/libcfs/debug.c
@@ -26,6 +26,7 @@
 
 # define DEBUG_SUBSYSTEM S_LNET
 
+#include <stdarg.h>
 #include <libcfs/kp30.h>
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
@@ -470,10 +471,6 @@ EXPORT_SYMBOL(libcfs_debug_set_level);
 
 #include <libcfs/libcfs.h>
 
-#ifdef HAVE_SYS_USER_H
-# include <sys/user.h>
-#endif
-
 #ifdef HAVE_CATAMOUNT_DATA_H
 #include <catamount/data.h>
 #include <catamount/lputs.h>

diff --git a/lnet/selftest/brw_test.c b/lnet/selftest/brw_test.c
index 78bed3c..8b0dd01 100644 (file)
--- a/lnet/selftest/brw_test.c
+++ b/lnet/selftest/brw_test.c
@@ -6,7 +6,6 @@
  *
  */
 
-#include <libcfs/kp30.h>
 #include "selftest.h"
 
 

diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c
index fc6eaaa..3fde971 100644 (file)
--- a/lnet/selftest/framework.c
+++ b/lnet/selftest/framework.c
@@ -8,13 +8,8 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
-#include <libcfs/libcfs.h>
-#include <lnet/lib-lnet.h>
-
 #include "selftest.h"
 
-
 int brw_inject_errors = 0;
 CFS_MODULE_PARM(brw_inject_errors, "i", int, 0644,
                 "# data errors to inject randomly, zero by default");

diff --git a/lnet/selftest/ping_test.c b/lnet/selftest/ping_test.c
index 6f0334b..39a67c7 100644 (file)
--- a/lnet/selftest/ping_test.c
+++ b/lnet/selftest/ping_test.c
@@ -7,7 +7,7 @@
  *
  * Test client & Server
  */
-#include <libcfs/kp30.h>
+
 #include "selftest.h"
 
 #define LST_PING_TEST_MAGIC     0xbabeface

diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c
index 057a081..baf8935 100644 (file)
--- a/lnet/selftest/rpc.c
+++ b/lnet/selftest/rpc.c
@@ -8,10 +8,6 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
-#include <libcfs/libcfs.h>
-#include <lnet/lib-lnet.h>
-
 #include "selftest.h"
 
 

diff --git a/lnet/selftest/selftest.h b/lnet/selftest/selftest.h
index 63179ff..f27106e 100644 (file)
--- a/lnet/selftest/selftest.h
+++ b/lnet/selftest/selftest.h
@@ -10,16 +10,17 @@
 
 #define LNET_ONLY
 
+#ifndef __KERNEL__
+#include <liblustre.h> /* userland spinlock_t and atomic_t */
+#endif
+
 #include <libcfs/kp30.h>
 #include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
+#include <lnet/lib-lnet.h>
 #include <lnet/lib-types.h>
 #include <lnet/lnetst.h>
 
-#ifndef __KERNEL__
-#include <liblustre.h> /* userland spinlock_t and atomic_t */
-#endif
-
 #include "rpc.h"
 #include "timer.h"
 

diff --git a/lnet/selftest/timer.c b/lnet/selftest/timer.c
index 388cd8a..eb72a78 100644 (file)
--- a/lnet/selftest/timer.c
+++ b/lnet/selftest/timer.c
@@ -8,10 +8,6 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
-#include <libcfs/libcfs.h>
-#include <lnet/lib-lnet.h>
-
 #include "selftest.h"
 
 

diff --git a/lnet/selftest/workitem.c b/lnet/selftest/workitem.c
index 0ed8350..19b0a79 100644 (file)
--- a/lnet/selftest/workitem.c
+++ b/lnet/selftest/workitem.c
@@ -7,9 +7,6 @@
  */
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/kp30.h>
-#include <libcfs/libcfs.h>
-#include <lnet/lib-lnet.h>
 #include "selftest.h"
 
 

diff --git a/lustre/liblustre/llite_lib.c b/lustre/liblustre/llite_lib.c
index 1667b5d..e6d04e6 100644 (file)
--- a/lustre/liblustre/llite_lib.c
+++ b/lustre/liblustre/llite_lib.c
@@ -44,6 +44,7 @@
  * of 'LIST_HEAD'. undef it to suppress warnings
  */
 #undef LIST_HEAD
+#include <liblustre.h>
 #include <lnet/lnetctl.h>     /* needed for parse_dump */
 
 #include "lutil.h"

diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index d2b4a0b..1386608 100644 (file)
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -49,9 +49,8 @@
 #include <unistd.h>
 #endif
 
-#include <lnet/lnetctl.h>
-
 #include <liblustre.h>
+#include <lnet/lnetctl.h>
 #include <obd.h>
 #include <lustre_lib.h>
 #include <obd_lov.h>