[PATCH 28/30] staging: lustre: remove remaining libcfs_all.h includes from lustre/lustre

2018-05-20 Thread NeilBrown 
Most of these aren't needed, a few can be simplified.

Signed-off-by: NeilBrown 
---
 .../staging/lustre/lustre/include/lustre_intent.h  |2 ++
 drivers/staging/lustre/lustre/ldlm/l_lock.c|1 -
 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c   |1 -
 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c  |1 -
 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c |1 -
 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c|2 +-
 drivers/staging/lustre/lustre/llite/glimpse.c  |1 -
 drivers/staging/lustre/lustre/llite/lcommon_cl.c   |1 -
 drivers/staging/lustre/lustre/llite/vvp_object.c   |2 --
 drivers/staging/lustre/lustre/lov/lov_ea.c |1 -
 drivers/staging/lustre/lustre/lov/lov_merge.c  |2 --
 drivers/staging/lustre/lustre/lov/lov_obd.c|1 -
 drivers/staging/lustre/lustre/lov/lov_offset.c |2 --
 drivers/staging/lustre/lustre/lov/lov_pool.c   |2 --
 drivers/staging/lustre/lustre/lov/lov_request.c|2 --
 .../staging/lustre/lustre/obdecho/echo_client.c|1 -
 drivers/staging/lustre/lustre/osc/osc_lock.c   |1 -
 drivers/staging/lustre/lustre/osc/osc_request.c|2 +-
 18 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/lustre/lustre/include/lustre_intent.h 
b/drivers/staging/lustre/lustre/include/lustre_intent.h
index 519e94fc089d..51e5c0e03872 100644
--- a/drivers/staging/lustre/lustre/include/lustre_intent.h
+++ b/drivers/staging/lustre/lustre/include/lustre_intent.h
@@ -34,6 +34,8 @@
 #ifndef LUSTRE_INTENT_H
 #define LUSTRE_INTENT_H
 
+#include 
+
 /* intent IT_XXX are defined in lustre/include/obd.h */
 
 struct lookup_intent {
diff --git a/drivers/staging/lustre/lustre/ldlm/l_lock.c 
b/drivers/staging/lustre/lustre/ldlm/l_lock.c
index fbeec219a75b..296259aa51e6 100644
--- a/drivers/staging/lustre/lustre/ldlm/l_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/l_lock.c
@@ -32,7 +32,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LDLM
-#include 
 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c 
b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
index a6435cf8924a..4da23ade2bb3 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
@@ -47,7 +47,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LDLM
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c 
b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
index d8db751cf5a7..0aa4f234a4f4 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
@@ -40,7 +40,6 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c 
b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
index 66702428a914..a644d133063b 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
@@ -38,7 +38,6 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c 
b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
index 7a1d18176032..b0a29f50c7d6 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
@@ -38,7 +38,7 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/llite/glimpse.c 
b/drivers/staging/lustre/lustre/llite/glimpse.c
index eddab7d2887b..ce0d51767da3 100644
--- a/drivers/staging/lustre/lustre/llite/glimpse.c
+++ b/drivers/staging/lustre/lustre/llite/glimpse.c
@@ -37,7 +37,6 @@
  *   Author: Oleg Drokin 
  */
 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/llite/lcommon_cl.c 
b/drivers/staging/lustre/lustre/llite/lcommon_cl.c
index de1de3b2dded..d7ea39ce0cb2 100644
--- a/drivers/staging/lustre/lustre/llite/lcommon_cl.c
+++ b/drivers/staging/lustre/lustre/llite/lcommon_cl.c
@@ -38,7 +38,6 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/llite/vvp_object.c 
b/drivers/staging/lustre/lustre/llite/vvp_object.c
index 5aedbdbc75b7..b2cb51c8f7f4 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_object.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_object.c
@@ -37,8 +37,6 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#include 
-
 #include 
 
 #include "llite_internal.h"
diff --git a/drivers/staging/lustre/lustre/lov/lov_ea.c 
b/drivers/staging/lustre/lustre/lov/lov_ea.c
index 223fb76c13aa..c80320ab0858 100644
--- a/drivers/staging/lustre/lustre/lov/lov_ea.c
+++ b/drivers/staging/lustre/lustre/lov/lov_ea.c
@@ -38,7 +38,6 @@
 #define DEBUG_SUBSYSTEM S_LOV
 
 #include 
-#include 
 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/lov/lov_merge.c

[PATCH 28/30] staging: lustre: remove remaining libcfs_all.h includes from lustre/lustre

2018-05-20 Thread NeilBrown 
Most of these aren't needed, a few can be simplified.

Signed-off-by: NeilBrown 
---
 .../staging/lustre/lustre/include/lustre_intent.h  |2 ++
 drivers/staging/lustre/lustre/ldlm/l_lock.c|1 -
 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c   |1 -
 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c  |1 -
 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c |1 -
 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c|2 +-
 drivers/staging/lustre/lustre/llite/glimpse.c  |1 -
 drivers/staging/lustre/lustre/llite/lcommon_cl.c   |1 -
 drivers/staging/lustre/lustre/llite/vvp_object.c   |2 --
 drivers/staging/lustre/lustre/lov/lov_ea.c |1 -
 drivers/staging/lustre/lustre/lov/lov_merge.c  |2 --
 drivers/staging/lustre/lustre/lov/lov_obd.c|1 -
 drivers/staging/lustre/lustre/lov/lov_offset.c |2 --
 drivers/staging/lustre/lustre/lov/lov_pool.c   |2 --
 drivers/staging/lustre/lustre/lov/lov_request.c|2 --
 .../staging/lustre/lustre/obdecho/echo_client.c|1 -
 drivers/staging/lustre/lustre/osc/osc_lock.c   |1 -
 drivers/staging/lustre/lustre/osc/osc_request.c|2 +-
 18 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/lustre/lustre/include/lustre_intent.h 
b/drivers/staging/lustre/lustre/include/lustre_intent.h
index 519e94fc089d..51e5c0e03872 100644
--- a/drivers/staging/lustre/lustre/include/lustre_intent.h
+++ b/drivers/staging/lustre/lustre/include/lustre_intent.h
@@ -34,6 +34,8 @@
 #ifndef LUSTRE_INTENT_H
 #define LUSTRE_INTENT_H
 
+#include 
+
 /* intent IT_XXX are defined in lustre/include/obd.h */
 
 struct lookup_intent {
diff --git a/drivers/staging/lustre/lustre/ldlm/l_lock.c 
b/drivers/staging/lustre/lustre/ldlm/l_lock.c
index fbeec219a75b..296259aa51e6 100644
--- a/drivers/staging/lustre/lustre/ldlm/l_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/l_lock.c
@@ -32,7 +32,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LDLM
-#include 
 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c 
b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
index a6435cf8924a..4da23ade2bb3 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
@@ -47,7 +47,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LDLM
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c 
b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
index d8db751cf5a7..0aa4f234a4f4 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
@@ -40,7 +40,6 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c 
b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
index 66702428a914..a644d133063b 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
@@ -38,7 +38,6 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c 
b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
index 7a1d18176032..b0a29f50c7d6 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
@@ -38,7 +38,7 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/llite/glimpse.c 
b/drivers/staging/lustre/lustre/llite/glimpse.c
index eddab7d2887b..ce0d51767da3 100644
--- a/drivers/staging/lustre/lustre/llite/glimpse.c
+++ b/drivers/staging/lustre/lustre/llite/glimpse.c
@@ -37,7 +37,6 @@
  *   Author: Oleg Drokin 
  */
 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/llite/lcommon_cl.c 
b/drivers/staging/lustre/lustre/llite/lcommon_cl.c
index de1de3b2dded..d7ea39ce0cb2 100644
--- a/drivers/staging/lustre/lustre/llite/lcommon_cl.c
+++ b/drivers/staging/lustre/lustre/llite/lcommon_cl.c
@@ -38,7 +38,6 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#include 
 #include 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/llite/vvp_object.c 
b/drivers/staging/lustre/lustre/llite/vvp_object.c
index 5aedbdbc75b7..b2cb51c8f7f4 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_object.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_object.c
@@ -37,8 +37,6 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-#include 
-
 #include 
 
 #include "llite_internal.h"
diff --git a/drivers/staging/lustre/lustre/lov/lov_ea.c 
b/drivers/staging/lustre/lustre/lov/lov_ea.c
index 223fb76c13aa..c80320ab0858 100644
--- a/drivers/staging/lustre/lustre/lov/lov_ea.c
+++ b/drivers/staging/lustre/lustre/lov/lov_ea.c
@@ -38,7 +38,6 @@
 #define DEBUG_SUBSYSTEM S_LOV
 
 #include 
-#include 
 
 #include 
 #include 
diff --git a/drivers/staging/lustre/lustre/lov/lov_merge.c 
b/drivers/staging/lustre/lustre/lov/lov_merge.c