LU-9183 libcfs: handle get_user_pages() with gup_flags

[fs/lustre-release.git] / libcfs / libcfs / watchdog.c

diff --git a/libcfs/libcfs/watchdog.c b/libcfs/libcfs/watchdog.c
index 514bcf9..05c984a 100644 (file)
--- a/libcfs/libcfs/watchdog.c
+++ b/libcfs/libcfs/watchdog.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -107,7 +103,7 @@ lcw_dump(struct lc_watchdog *lcw)
         ENTRY;
         rcu_read_lock();
        if (lcw->lcw_task == NULL) {
-                LCONSOLE_WARN("Process " LPPID " was not found in the task "
+               LCONSOLE_WARN("Process %d was not found in the task "
                               "list; watchdog callback may be incomplete\n",
                               (int)lcw->lcw_pid);
         } else {
@@ -118,7 +114,7 @@ lcw_dump(struct lc_watchdog *lcw)
         EXIT;
 }
 
-static void lcw_cb(ulong_ptr_t data)
+static void lcw_cb(uintptr_t data)
 {
         struct lc_watchdog *lcw = (struct lc_watchdog *)data;
         ENTRY;
@@ -209,7 +205,7 @@ static void lcw_dump_stack(struct lc_watchdog *lcw)
 
 static void lc_watchdog_dumplog(pid_t pid, void *data)
 {
-       libcfs_debug_dumplog_internal((void *)((long_ptr_t)pid));
+       libcfs_debug_dumplog_internal((void *)((uintptr_t)pid));
 }
 
 static int lcw_dispatch_main(void *data)
@@ -272,7 +268,7 @@ static int lcw_dispatch_main(void *data)
                        spin_unlock_bh(&lcw_pending_timers_lock);
                        spin_unlock_bh(&lcw->lcw_lock);
 
-                        CDEBUG(D_INFO, "found lcw for pid " LPPID "\n",
+                       CDEBUG(D_INFO, "found lcw for pid %d\n",
                                lcw->lcw_pid);
                         lcw_dump_stack(lcw);
 
@@ -368,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);
 }
@@ -430,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;
@@ -459,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");