liblustre:

 - supress a warning of glimpse callback
 - remove the debug code accidently checked in sometime before

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index 67714ef..064ac80 100644 (file)
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -646,7 +646,6 @@ static inline void del_timer(struct timer_list *l)
 
 #define time_after(a, b)                                        \
 ({                                                              \
 
 #define time_after(a, b)                                        \
 ({                                                              \

-        printf("Error: inapproiate call time_after()\n");       \

         1;                                                      \
 })
 
         1;                                                      \
 })
 

diff --git a/lustre/ptlrpc/pinger.c b/lustre/ptlrpc/pinger.c
index ab85900..1198683 100644 (file)
--- a/lustre/ptlrpc/pinger.c
+++ b/lustre/ptlrpc/pinger.c
@@ -463,7 +463,6 @@ int ptlrpc_start_pinger(void)
         pinger_callback =
                 liblustre_register_wait_callback(&pinger_check_rpcs, &pinger_args);
 #endif
         pinger_callback =
                 liblustre_register_wait_callback(&pinger_check_rpcs, &pinger_args);
 #endif

-        obd_timeout = 10;

         return 0;
 }
 
         return 0;
 }