LU-1346 libcfs: cleanup macros in portals_compat25.h

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-debug.c

diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c
index cc4f3a2..4d0f4df 100644 (file)
--- a/libcfs/libcfs/linux/linux-debug.c
+++ b/libcfs/libcfs/linux/linux-debug.c
@@ -27,7 +27,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, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -94,7 +94,7 @@ void libcfs_run_debug_log_upcall(char *file)
 
         argv[2] = NULL;
 
-        rc = USERMODEHELPER(argv[0], argv, envp);
+        rc = call_usermodehelper(argv[0], argv, envp, 1);
         if (rc < 0 && rc != -ENOENT) {
                 CERROR("Error %d invoking LNET debug log upcall %s %s; "
                        "check /proc/sys/lnet/debug_log_upcall\n",
@@ -124,7 +124,7 @@ void libcfs_run_upcall(char **argv)
 
         LASSERT(argc >= 2);
 
-        rc = USERMODEHELPER(argv[0], argv, envp);
+        rc = call_usermodehelper(argv[0], argv, envp, 1);
         if (rc < 0 && rc != -ENOENT) {
                 CERROR("Error %d invoking LNET upcall %s %s%s%s%s%s%s%s%s; "
                        "check /proc/sys/lnet/upcall\n",
@@ -160,18 +160,6 @@ void libcfs_run_lbug_upcall(struct libcfs_debug_msg_data *msgdata)
         libcfs_run_upcall (argv);
 }
 
-#ifdef __arch_um__
-void lbug_with_loc(struct libcfs_debug_msg_data *msgdata)
-{
-        libcfs_catastrophe = 1;
-        libcfs_debug_msg(msgdata, "LBUG - trying to dump log to %s\n",
-                         libcfs_debug_file_path);
-        libcfs_debug_dumplog();
-        libcfs_run_lbug_upcall(msgdata);
-        asm("int $3");
-        panic("LBUG");
-}
-#else
 /* coverity[+kill] */
 void lbug_with_loc(struct libcfs_debug_msg_data *msgdata)
 {
@@ -193,7 +181,6 @@ void lbug_with_loc(struct libcfs_debug_msg_data *msgdata)
         while (1)
                 schedule();
 }
-#endif /* __arch_um__ */
 
 #ifdef __KERNEL__
 
@@ -254,12 +241,7 @@ static DUMP_TRACE_CONST struct stacktrace_ops print_trace_ops = {
 
 void libcfs_debug_dumpstack(struct task_struct *tsk)
 {
-#if defined(__arch_um__)
-        if (tsk != NULL)
-                CWARN("stack dump for pid %d (%d) requested; wake up gdb.\n",
-                      tsk->pid, UML_PID(tsk));
-        //asm("int $3");
-#elif defined(HAVE_DUMP_TRACE)
+#if defined(HAVE_DUMP_TRACE)
         /* dump_stack() */
         /* show_trace() */
         if (tsk == NULL)