From dad55bec06af80b132ba037d32cf31a7718abf9b Mon Sep 17 00:00:00 2001 From: adilger Date: Wed, 4 Jun 2003 00:00:30 +0000 Subject: [PATCH] Make LBUG() just a special case of LBUG_WITH_LOC(). --- lnet/include/linux/kp30.h | 19 ++----------------- lustre/portals/include/linux/kp30.h | 19 ++----------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/lnet/include/linux/kp30.h b/lnet/include/linux/kp30.h index 6dc2ada..34a9bbc 100644 --- a/lnet/include/linux/kp30.h +++ b/lnet/include/linux/kp30.h @@ -223,14 +223,6 @@ do { \ portals_run_lbug_upcall(file, func, line); \ panic("LBUG"); \ } while (0) - -#define LBUG() \ -do { \ - CEMERG("LBUG - trying to dump log to /tmp/lustre-log\n"); \ - portals_debug_dumplog(); \ - portals_run_lbug_upcall(__FILE__, __FUNCTION__, __LINE__); \ - panic("LBUG"); \ -} while (0) #else #define LBUG_WITH_LOC(file, func, line) \ do { \ @@ -240,17 +232,10 @@ do { \ set_task_state(current, TASK_UNINTERRUPTIBLE); \ schedule(); \ } while (0) - -#define LBUG() \ -do { \ - CEMERG("LBUG\n"); \ - portals_debug_dumplog(); \ - portals_run_lbug_upcall(__FILE__, __FUNCTION__, __LINE__); \ - set_task_state(current, TASK_UNINTERRUPTIBLE); \ - schedule(); \ -} while (0) #endif /* __arch_um__ */ +#define LBUG() LBUG_WITH_LOC(__FILE__, __FUNCTION__, __LINE__) + /* * Memory */ diff --git a/lustre/portals/include/linux/kp30.h b/lustre/portals/include/linux/kp30.h index 6dc2ada..34a9bbc 100644 --- a/lustre/portals/include/linux/kp30.h +++ b/lustre/portals/include/linux/kp30.h @@ -223,14 +223,6 @@ do { \ portals_run_lbug_upcall(file, func, line); \ panic("LBUG"); \ } while (0) - -#define LBUG() \ -do { \ - CEMERG("LBUG - trying to dump log to /tmp/lustre-log\n"); \ - portals_debug_dumplog(); \ - portals_run_lbug_upcall(__FILE__, __FUNCTION__, __LINE__); \ - panic("LBUG"); \ -} while (0) #else #define LBUG_WITH_LOC(file, func, line) \ do { \ @@ -240,17 +232,10 @@ do { \ set_task_state(current, TASK_UNINTERRUPTIBLE); \ schedule(); \ } while (0) - -#define LBUG() \ -do { \ - CEMERG("LBUG\n"); \ - portals_debug_dumplog(); \ - portals_run_lbug_upcall(__FILE__, __FUNCTION__, __LINE__); \ - set_task_state(current, TASK_UNINTERRUPTIBLE); \ - schedule(); \ -} while (0) #endif /* __arch_um__ */ +#define LBUG() LBUG_WITH_LOC(__FILE__, __FUNCTION__, __LINE__) + /* * Memory */ -- 1.8.3.1