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

diff --git a/include/sys/debug.h b/include/sys/debug.h
index a670c037470b8d5a17c8c7edd282f2f2301ff24e..13c030c9e2bed5b81e7454b3f4a604d0eaccd9fb 100644 (file)
--- a/include/sys/debug.h
+++ b/include/sys/debug.h
@@ -146,12 +146,14 @@ struct page_collection {
         int               pc_want_daemon_pages;
 };
 
+#define SBUG()         spl_debug_bug(__FILE__, __FUNCTION__, __LINE__);
+
 /* ASSERTION that is safe to use within the debug system */
 #define __ASSERT(cond)                                                 \
 do {                                                                   \
        if (unlikely(!(cond))) {                                        \
                 printk(KERN_ERR "ASSERTION("#cond") failed");           \
-               BUG();                                                  \
+               SBUG();                                                 \
        }                                                               \
 } while (0)
 
@@ -194,7 +196,7 @@ do {                                                                    \
                               __FILE__, __FUNCTION__, __LINE__,         \
                               "VERIFY3(" FMT " " #OP " " FMT ")\n",     \
                               CAST __left,  CAST __right);              \
-                spl_debug_bug(__FILE__, __FUNCTION__, __LINE__)         \
+                spl_debug_bug(__FILE__, __FUNCTION__, __LINE__);        \
         }                                                               \
 } while (0)
 
@@ -207,7 +209,6 @@ do {                                                                    \
 #define ASSERT3P(x,y,z) VERIFY3P(x, y, z)
 
 #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...) \
         spl_debug_vmsg(cdls, subsys, mask, file, fn,                    \

diff --git a/modules/spl/spl-proc.c b/modules/spl/spl-proc.c
index 89ffc2baaf0c80f1fa70718501c58a7fa5019d6e..14b19b6cab89ac1f9c06734eb17c49d6158edd12 100644 (file)
--- a/modules/spl/spl-proc.c
+++ b/modules/spl/spl-proc.c
@@ -195,8 +195,8 @@ proc_force_bug(struct ctl_table *table, int write, struct file *filp,
        ENTRY;
 
         if (write) {
-               CERROR("Crashing due to forced BUG\n");
-               BUG();
+               CERROR("Crashing due to forced SBUG\n");
+               SBUG();
               /* Unreachable */
         } else {
                 *lenp = 0;