aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre/lustre/include/linux/obd.h
diff options
context:
space:
mode:
authorPeng Tao <bergwolf@gmail.com>2013-07-15 22:27:15 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-23 12:24:05 -0700
commit5d4450c41fe308e10a1805cb90d26adbf1267146 (patch)
tree06d47059e599d313ea5aec4c64e82fb2199b54ae /drivers/staging/lustre/lustre/include/linux/obd.h
parentstaging/lustre: fix build when CONFIG_UIDGID_STRICT_TYPE_CHECKS is on (diff)
downloadlinux-dev-5d4450c41fe308e10a1805cb90d26adbf1267146.tar.xz
linux-dev-5d4450c41fe308e10a1805cb90d26adbf1267146.zip
staging/lustre: fix build error on non-x86 platforms
dump_trace() is only available on X86. Without it, Lustre's own watchdog is broken. We can only dump current task's stack. The client-side this code is much less likely to hit deadlocks and it's probably OK to drop this altogether, since we hardly have any ptlrpc threads on clients, most notable ones are ldlm cb threads that should not really be blocking on the client anyway. Remove libcfs watchdog for now, until the upstream kernel watchdog can detect distributed deadlocks and dump other kernel threads. Cc: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: Peng Tao <tao.peng@emc.com> Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/include/linux/obd.h')
-rw-r--r--drivers/staging/lustre/lustre/include/linux/obd.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/lustre/lustre/include/linux/obd.h b/drivers/staging/lustre/lustre/include/linux/obd.h
index 2c36c0d19d06..01a50265239d 100644
--- a/drivers/staging/lustre/lustre/include/linux/obd.h
+++ b/drivers/staging/lustre/lustre/include/linux/obd.h
@@ -93,11 +93,8 @@ static inline void __client_obd_list_lock(client_obd_lock_t *lock,
lock, task->comm, task->pid,
lock->func, lock->line,
(jiffies - lock->time) / HZ);
- LCONSOLE_WARN("====== for process holding the "
- "lock =====\n");
- libcfs_debug_dumpstack(task);
LCONSOLE_WARN("====== for current process =====\n");
- libcfs_debug_dumpstack(NULL);
+ dump_stack();
LCONSOLE_WARN("====== end =======\n");
cfs_pause(1000 * HZ);
}