Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Frist minor batch of fixes. Catch a dropped ;, and use SBUG instead of BUG. 

git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@77 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c
This commit is contained in:
behlendo 2008-04-19 00:02:11 +00:00
parent ce86265693
commit 2fae1b3d0a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/sys/debug.h
View File

@ -146,12 +146,14 @@ struct page_collection {
int pc_want_daemon_pages; int pc_want_daemon_pages;
}; };
#define SBUG() spl_debug_bug(__FILE__, __FUNCTION__, __LINE__);
/* ASSERTION that is safe to use within the debug system */ /* ASSERTION that is safe to use within the debug system */
#define __ASSERT(cond) \ #define __ASSERT(cond) \
do { \ do { \
if (unlikely(!(cond))) { \ if (unlikely(!(cond))) { \
printk(KERN_ERR "ASSERTION("#cond") failed"); \ printk(KERN_ERR "ASSERTION("#cond") failed"); \
BUG(); \ SBUG(); \
} \ } \
} while (0) } while (0)
@ -194,7 +196,7 @@ do { \
__FILE__, __FUNCTION__, __LINE__, \ __FILE__, __FUNCTION__, __LINE__, \
"VERIFY3(" FMT " " #OP " " FMT ")\n", \ "VERIFY3(" FMT " " #OP " " FMT ")\n", \
CAST __left, CAST __right); \ CAST __left, CAST __right); \
spl_debug_bug(__FILE__, __FUNCTION__, __LINE__) \ spl_debug_bug(__FILE__, __FUNCTION__, __LINE__); \
} \ } \
} while (0) } while (0)
@ -207,7 +209,6 @@ do { \
#define ASSERT3P(x,y,z) VERIFY3P(x, y, z) #define ASSERT3P(x,y,z) VERIFY3P(x, y, z)
#define VERIFY(x) ASSERT(x) #define VERIFY(x) ASSERT(x)
#define SBUG() spl_debug_bug(__FILE__, __FUNCTION__, __LINE__);
#define spl_debug_msg(cdls, subsys, mask, file, fn, line, format, a...) \ #define spl_debug_msg(cdls, subsys, mask, file, fn, line, format, a...) \
spl_debug_vmsg(cdls, subsys, mask, file, fn, \ spl_debug_vmsg(cdls, subsys, mask, file, fn, \

4
modules/spl/spl-proc.c
View File

@ -195,8 +195,8 @@ proc_force_bug(struct ctl_table *table, int write, struct file *filp,
ENTRY; ENTRY;
if (write) { if (write) {
CERROR("Crashing due to forced BUG\n"); CERROR("Crashing due to forced SBUG\n");
BUG(); SBUG();
/* Unreachable */ /* Unreachable */
} else { } else {
*lenp = 0; *lenp = 0;