[Ocfs2-commits] mfasheh commits r2485 - trunk/fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: zab
Date: 2005-08-01 13:04:00 -0500 (Mon, 01 Aug 2005)
New Revision: 2485

Modified:
   trunk/fs/ocfs2/cluster/heartbeat.c
   trunk/fs/ocfs2/cluster/tcp.c
Log:
* convert msecs to jiffies when queueing delayed work

Signed-off-by: zab



Modified: trunk/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/cluster/heartbeat.c	2005-07-29 22:28:42 UTC (rev 2484)
+++ trunk/fs/ocfs2/cluster/heartbeat.c	2005-08-01 18:04:00 UTC (rev 2485)
@@ -20,6 +20,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/jiffies.h>
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/bio.h>
@@ -146,7 +147,7 @@
 
 	cancel_delayed_work(&reg->hr_write_timeout_work);
 	schedule_delayed_work(&reg->hr_write_timeout_work,
-			      O2HB_MAX_WRITE_TIMEOUT_MS);
+			      msecs_to_jiffies(O2HB_MAX_WRITE_TIMEOUT_MS));
 }
 
 static void o2hb_disarm_write_timeout(struct o2hb_region *reg)

Modified: trunk/fs/ocfs2/cluster/tcp.c
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.c	2005-07-29 22:28:42 UTC (rev 2484)
+++ trunk/fs/ocfs2/cluster/tcp.c	2005-08-01 18:04:00 UTC (rev 2485)
@@ -54,6 +54,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/jiffies.h>
 #include <linux/slab.h>
 #include <linux/idr.h>
 #include <linux/kref.h>
@@ -409,7 +410,7 @@
 	if (!was_err && nn->nn_persistent_error) {
 		o2quo_conn_err(o2net_num_from_nn(nn));
 		queue_delayed_work(o2net_wq, &nn->nn_still_up,
-				   O2NET_QUORUM_DELAY_MS);
+				   msecs_to_jiffies(O2NET_QUORUM_DELAY_MS));
 	}
 
 	if (was_valid && !valid) {