X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Fwatchdog.c;h=05c984afcbd1913b8b3d807cf7dbb08bd0aa089d;hb=bcb737a19433e3e32df6a826f29d15a3666f54d8;hp=04e4da7cd2ad3d845e9ac039436f28145846e797;hpb=72057a3af19ee02d9a686bd7e7d074917e381310;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/watchdog.c b/libcfs/libcfs/watchdog.c
index 04e4da7..05c984a 100644
--- a/libcfs/libcfs/watchdog.c
+++ b/libcfs/libcfs/watchdog.c
@@ -364,19 +364,19 @@ struct lc_watchdog *lc_watchdog_add(int timeout,
 	lcw->lcw_state    = LC_WATCHDOG_DISABLED;
 
 	INIT_LIST_HEAD(&lcw->lcw_list);
-	cfs_timer_init(&lcw->lcw_timer, lcw_cb, lcw);
+	setup_timer(&lcw->lcw_timer, lcw_cb, (unsigned long)lcw);
 
 	mutex_lock(&lcw_refcount_mutex);
 	if (++lcw_refcount == 1)
 		lcw_dispatch_start();
 	mutex_unlock(&lcw_refcount_mutex);
 
-        /* Keep this working in case we enable them by default */
-        if (lcw->lcw_state == LC_WATCHDOG_ENABLED) {
-                lcw->lcw_last_touched = cfs_time_current();
-                cfs_timer_arm(&lcw->lcw_timer, cfs_time_seconds(timeout) +
-                              cfs_time_current());
-        }
+	/* Keep this working in case we enable them by default */
+	if (lcw->lcw_state == LC_WATCHDOG_ENABLED) {
+		lcw->lcw_last_touched = cfs_time_current();
+		mod_timer(&lcw->lcw_timer, cfs_time_seconds(timeout) +
+			  cfs_time_current());
+	}
 
         RETURN(lcw);
 }
@@ -426,8 +426,8 @@ void lc_watchdog_touch(struct lc_watchdog *lcw, int timeout)
 
         lcw_update_time(lcw, "resumed");
 
-        cfs_timer_arm(&lcw->lcw_timer, cfs_time_current() +
-                      cfs_time_seconds(timeout));
+	mod_timer(&lcw->lcw_timer, cfs_time_current() +
+		  cfs_time_seconds(timeout));
 	lcw->lcw_state = LC_WATCHDOG_ENABLED;
 
         EXIT;
@@ -455,7 +455,7 @@ void lc_watchdog_delete(struct lc_watchdog *lcw)
         ENTRY;
         LASSERT(lcw != NULL);
 
-        cfs_timer_disarm(&lcw->lcw_timer);
+	del_timer(&lcw->lcw_timer);
 
         lcw_update_time(lcw, "stopped");