i=adilger

* fix ldiskfs module path
* add uml debug file paths

lnet/libcfs/debug.c

@@ -67,7 +67,11 @@ EXPORT_SYMBOL(libcfs_kmemory);
 
 static cfs_waitq_t debug_ctlwq;
 
+#ifdef __arch_um__
+char debug_file_path[1024] = "/r/tmp/lustre-log";
+#else
 char debug_file_path[1024] = "/tmp/lustre-log";
+#endif
 
 int libcfs_panic_in_progress;
 

lnet/libcfs/linux/linux-debug.c

@@ -121,7 +121,7 @@ void lbug_with_loc(char *file, const char *func, const int line)
 {
         libcfs_catastrophe = 1;
         libcfs_debug_msg(NULL, 0, D_EMERG, file, func, line,
-                         "LBUG - trying to dump log to /tmp/lustre-log\n");
+                         "LBUG - trying to dump log to %s\n", debug_file_path);
         libcfs_debug_dumplog();
         libcfs_run_lbug_upcall(file, func, line);
         asm("int $3");

lnet/utils/debug.c

@@ -769,7 +769,7 @@ static struct mod_paths {
         {"mdc", "lustre/mdc"},
         {"llite", "lustre/llite"},
         {"lustre", "lustre/llite"},
-        {"ldiskfs", "lustre/ldiskfs"},
+        {"ldiskfs", "ldiskfs/ldiskfs"},
         {"smfs", "lustre/smfs"},
         {"obdecho", "lustre/obdecho"},
         {"ldlm", "lustre/ldlm"},