b=6233

[fs/lustre-release.git] / lustre / ptlrpc / ptlrpcd.c

diff --git a/lustre/ptlrpc/ptlrpcd.c b/lustre/ptlrpc/ptlrpcd.c
index 71cfdfd..1c2b462 100644 (file)
--- a/lustre/ptlrpc/ptlrpcd.c
+++ b/lustre/ptlrpc/ptlrpcd.c
@@ -35,20 +35,16 @@
 # else
 #  include <linux/locks.h>
 # endif
+# include <linux/ctype.h>
+# include <linux/init.h>
 #else /* __KERNEL__ */
 # include <liblustre.h>
+# include <ctype.h>
 #endif
 
-#include <linux/kp30.h>
+#include <libcfs/kp30.h>
 #include <linux/lustre_net.h>
 
-#ifdef __KERNEL__
-# include <linux/ctype.h>
-# include <linux/init.h>
-#else
-# include <ctype.h>
-#endif
-
 #include <linux/lustre_ha.h>
 #include <linux/obd_support.h> /* for OBD_FAIL_CHECK */
 #include <linux/lprocfs_status.h>
@@ -89,12 +85,12 @@ void ptlrpcd_add_req(struct ptlrpc_request *req)
 
         if (req->rq_send_state == LUSTRE_IMP_FULL)
                 pc = &ptlrpcd_pc;
-        else 
+        else
                 pc = &ptlrpcd_recovery_pc;
 
         ptlrpc_set_add_new_req(pc->pc_set, req);
         req->rq_ptlrpcd_data = pc;
-                
+
         ptlrpcd_wake(req);
 }