Merge tag 'ntb-4.13-bugfixes' of git://github.com/jonmason/ntb

[mirror_ubuntu-artful-kernel.git] / lib / list_debug.c

diff --git a/lib/list_debug.c b/lib/list_debug.c
index 7f7bfa55eb6df3e9c9c3c2a244ff02d475197e9d..a34db8d276676782ca8d45f286827e7074e26a37 100644 (file)
--- a/lib/list_debug.c
+++ b/lib/list_debug.c
@@ -20,15 +20,16 @@
 bool __list_add_valid(struct list_head *new, struct list_head *prev,
                      struct list_head *next)
 {
-       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);
+       if (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 false;
 
        return true;
 }
@@ -41,18 +42,20 @@ bool __list_del_entry_valid(struct list_head *entry)
        prev = entry->prev;
        next = entry->next;
 
-       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);
+       if (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 false;
+
        return true;
 
 }