Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[sfrench/cifs-2.6.git] / lib / list_debug.c

diff --git a/lib/list_debug.c b/lib/list_debug.c
index e80d27c9789820d867139428650d6cbd88812165..4350ba9655bd182c966c1fc40909ace292c8a4a6 100644 (file)
--- a/lib/list_debug.c
+++ b/lib/list_debug.c
@@ -21,13 +21,15 @@ void __list_add(struct list_head *new,
                              struct list_head *next)
 {
        if (unlikely(next->prev != prev)) {
-               printk(KERN_ERR "list_add corruption. next->prev should be %p, but was %p\n",
-                       prev, next->prev);
+               printk(KERN_ERR "list_add corruption. next->prev should be "
+                       "prev (%p), but was %p. (next=%p).\n",
+                       prev, next->prev, next);
                BUG();
        }
        if (unlikely(prev->next != next)) {
-               printk(KERN_ERR "list_add corruption. prev->next should be %p, but was %p\n",
-                       next, prev->next);
+               printk(KERN_ERR "list_add corruption. prev->next should be "
+                       "next (%p), but was %p. (prev=%p).\n",
+                       next, prev->next, prev);
                BUG();
        }
        next->prev = new;
@@ -59,9 +61,6 @@ EXPORT_SYMBOL(list_add);
  */
 void list_del(struct list_head *entry)
 {
-       BUG_ON(entry->prev->next != entry);
-       BUG_ON(entry->next->prev != entry);
-
        if (unlikely(entry->prev->next != entry)) {
                printk(KERN_ERR "list_del corruption. prev->next should be %p, "
                                "but was %p\n", entry, entry->prev->next);