Branch b1_4

Ensure the PING_INTERVAL is at least 1s, otherwise obd_timeout < 4 can
cause severe heartburn.

diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index 9bb7058..afb43ac 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -38,7 +38,7 @@ extern int obd_memmax;
 extern unsigned int obd_fail_loc;
 extern unsigned int obd_dump_on_timeout;
 extern unsigned int obd_timeout;          /* seconds */
-#define PING_INTERVAL (obd_timeout / 4)
+#define PING_INTERVAL max(obd_timeout / 4, 1U)
 extern unsigned int ldlm_timeout;
 extern char obd_lustre_upcall[128];
 extern unsigned int obd_sync_filter;