bug: Provide toggle for BUG on data corruption

[linux-2.6-microblaze.git] / lib / list_debug.c

diff --git a/lib/list_debug.c b/lib/list_debug.c
index 276565f..7f7bfa5 100644 (file)
--- a/lib/list_debug.c
+++ b/lib/list_debug.c
@@ -20,21 +20,16 @@
 bool __list_add_valid(struct list_head *new, struct list_head *prev,
                      struct list_head *next)
 {
-       if (unlikely(next->prev != prev)) {
-               WARN(1, "list_add corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
-                       prev, next->prev, next);
-               return false;
-       }
-       if (unlikely(prev->next != next)) {
-               WARN(1, "list_add corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
-                       next, prev->next, prev);
-               return false;
-       }
-       if (unlikely(new == prev || new == next)) {
-               WARN(1, "list_add double add: new=%p, prev=%p, next=%p.\n",
-                       new, prev, next);
-               return false;
-       }
+       CHECK_DATA_CORRUPTION(next->prev != prev,
+               "list_add corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
+               prev, next->prev, next);
+       CHECK_DATA_CORRUPTION(prev->next != next,
+               "list_add corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
+               next, prev->next, prev);
+       CHECK_DATA_CORRUPTION(new == prev || new == next,
+               "list_add double add: new=%p, prev=%p, next=%p.\n",
+               new, prev, next);
+
        return true;
 }
 EXPORT_SYMBOL(__list_add_valid);
@@ -46,26 +41,18 @@ bool __list_del_entry_valid(struct list_head *entry)
        prev = entry->prev;
        next = entry->next;
 
-       if (unlikely(next == LIST_POISON1)) {
-               WARN(1, "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
-                       entry, LIST_POISON1);
-               return false;
-       }
-       if (unlikely(prev == LIST_POISON2)) {
-               WARN(1, "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
-                       entry, LIST_POISON2);
-               return false;
-       }
-       if (unlikely(prev->next != entry)) {
-               WARN(1, "list_del corruption. prev->next should be %p, but was %p\n",
-                       entry, prev->next);
-               return false;
-       }
-       if (unlikely(next->prev != entry)) {
-               WARN(1, "list_del corruption. next->prev should be %p, but was %p\n",
-                       entry, next->prev);
-               return false;
-       }
+       CHECK_DATA_CORRUPTION(next == LIST_POISON1,
+               "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
+               entry, LIST_POISON1);
+       CHECK_DATA_CORRUPTION(prev == LIST_POISON2,
+               "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
+               entry, LIST_POISON2);
+       CHECK_DATA_CORRUPTION(prev->next != entry,
+               "list_del corruption. prev->next should be %p, but was %p\n",
+               entry, prev->next);
+       CHECK_DATA_CORRUPTION(next->prev != entry,
+               "list_del corruption. next->prev should be %p, but was %p\n",
+               entry, next->prev);
        return true;
 
 }