[Ocfs2-commits] mfasheh commits r1223 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-06-29 18:16:54 -0500 (Tue, 29 Jun 2004)
New Revision: 1223

Modified:
   trunk/src/nm.c
Log:
* commit a patch by Xiaofeng Linx <xiaofeng.ling at intel.com>:

By print the jiffies in ocfs_volumn_thread() at first mount after
reboot, it is negative.(such as -253239)
so time_after(jiffies, 0) return false.  (because  ((long)(b) -
(long)(a) < 0) is true)
so first time, it goto finally.

-               if (!time_after (jiffies, (unsigned long) (osb->hbt)))
-                       goto finally;
then osb->hbt - j = 0 - jiffies = 0 - (-253239) = 253239
-  schedule_timeout (osb->hbt - j) will sleep about 253 seconds.


The follows is a simple fix instead of fixing time_after.



Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-06-29 00:56:11 UTC (rev 1222)
+++ trunk/src/nm.c	2004-06-29 23:16:54 UTC (rev 1223)
@@ -279,6 +279,7 @@
 
 	osb->dlm_task = current;
 
+	osb->hbt = OCFS_HEARTBEAT_JIFFIES + jiffies;
 	/* The delay changes based on multiplier */
 	while (!(OcfsGlobalCtxt.flags & OCFS_FLAG_SHUTDOWN_VOL_THREAD) &&
 	       !(osb->osb_flags & OCFS_OSB_FLAGS_BEING_DISMOUNTED)) {