b=18948

i=Mike Pershin
i=Andrew Perepechko
fix the compile warning

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index 67d5ca6..d5e060e 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -1159,7 +1159,10 @@ int ping_evictor_wake(struct obd_export *exp);
 #else
 #define ping_evictor_start()    do {} while (0)
 #define ping_evictor_stop()     do {} while (0)
-#define ping_evictor_wake(exp)  1
+static inline int ping_evictor_wake(struct obd_export *exp)
+{
+        return 1;
+}
 #endif
 
 /* ptlrpc/ptlrpcd.c */

diff --git a/lustre/ptlrpc/pinger.c b/lustre/ptlrpc/pinger.c
index 9ad3ca7..1374e03 100644 (file)
--- a/lustre/ptlrpc/pinger.c
+++ b/lustre/ptlrpc/pinger.c
@@ -46,6 +46,7 @@
 
 #include <obd_support.h>
 #include <obd_class.h>
+#include <lustre_net.h>
 #include "ptlrpc_internal.h"
 
 struct semaphore pinger_sem;

diff --git a/lustre/ptlrpc/ptlrpc_internal.h b/lustre/ptlrpc/ptlrpc_internal.h
index 84dccf9..7813a40 100644 (file)
--- a/lustre/ptlrpc/ptlrpc_internal.h
+++ b/lustre/ptlrpc/ptlrpc_internal.h
@@ -97,11 +97,6 @@ void ptlrpc_pinger_sending_on_import(struct obd_import *imp);
 void ptlrpc_pinger_commit_expected(struct obd_import *imp);
 void ptlrpc_pinger_wake_up(void);
 void ptlrpc_ping_import_soon(struct obd_import *imp);
-#ifdef __KERNEL__
-int ping_evictor_wake(struct obd_export *exp);
-#else
-#define ping_evictor_wake(exp)     1
-#endif
 
 /* recov_thread.c */
 int llog_recov_init(void);