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 ed1acf7..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
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,6 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 
+#include <linux/kthread.h>
 #include <libcfs/libcfs.h>
 #include "tracefile.h"
 
@@ -106,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 {
@@ -117,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;
@@ -202,6 +199,15 @@ static void lcw_dump_stack(struct lc_watchdog *lcw)
         }
 }
 
+/*
+ * Provided watchdog handlers
+ */
+
+static void lc_watchdog_dumplog(pid_t pid, void *data)
+{
+       libcfs_debug_dumplog_internal((void *)((uintptr_t)pid));
+}
+
 static int lcw_dispatch_main(void *data)
 {
         int                 rc = 0;
@@ -262,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);
 
@@ -358,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);
 }
@@ -378,7 +384,7 @@ EXPORT_SYMBOL(lc_watchdog_add);
 
 static void lcw_update_time(struct lc_watchdog *lcw, const char *message)
 {
-        cfs_time_t newtime = cfs_time_current();;
+       cfs_time_t newtime = cfs_time_current();
 
         if (lcw->lcw_state == LC_WATCHDOG_EXPIRED) {
                 struct timeval timediff;
@@ -419,10 +425,10 @@ void lc_watchdog_touch(struct lc_watchdog *lcw, int timeout)
         lc_watchdog_del_pending(lcw);
 
         lcw_update_time(lcw, "resumed");
-        lcw->lcw_state = LC_WATCHDOG_ENABLED;
 
-        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;
 }
@@ -449,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");
 
@@ -477,16 +483,6 @@ void lc_watchdog_delete(struct lc_watchdog *lcw)
 }
 EXPORT_SYMBOL(lc_watchdog_delete);
 
-/*
- * Provided watchdog handlers
- */
-
-void lc_watchdog_dumplog(pid_t pid, void *data)
-{
-        libcfs_debug_dumplog_internal((void *)((long_ptr_t)pid));
-}
-EXPORT_SYMBOL(lc_watchdog_dumplog);
-
 #else   /* !defined(WITH_WATCHDOG) */
 
 struct lc_watchdog *lc_watchdog_add(int timeout,