1 files changed, 24 insertions, 22 deletions

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 259db207b5d9..6a3bccba7e7d 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -380,6 +380,13 @@ static int verbose(struct lock_class *class)
 unsigned long nr_stack_trace_entries;
 static unsigned long stack_trace[MAX_STACK_TRACE_ENTRIES];
 
+static void print_lockdep_off(const char *bug_msg)
+{
+        printk(KERN_DEBUG "%s\n", bug_msg);
+        printk(KERN_DEBUG "turning off the locking correctness validator.\n");
+        printk(KERN_DEBUG "Please attach the output of /proc/lock_stat to the bug report\n");
+}
+
 static int save_trace(struct stack_trace *trace)
 {
         trace->nr_entries = 0;
@@ -409,8 +416,7 @@ static int save_trace(struct stack_trace *trace)
                 if (!debug_locks_off_graph_unlock())
                         return 0;
 
-                printk("BUG: MAX_STACK_TRACE_ENTRIES too low!\n");
-                printk("turning off the locking correctness validator.\n");
+                print_lockdep_off("BUG: MAX_STACK_TRACE_ENTRIES too low!");
                 dump_stack();
 
                 return 0;
@@ -763,8 +769,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
                 }
                 raw_local_irq_restore(flags);
 
-                printk("BUG: MAX_LOCKDEP_KEYS too low!\n");
-                printk("turning off the locking correctness validator.\n");
+                print_lockdep_off("BUG: MAX_LOCKDEP_KEYS too low!");
                 dump_stack();
                 return NULL;
         }
@@ -834,8 +839,7 @@ static struct lock_list *alloc_list_entry(void)
                 if (!debug_locks_off_graph_unlock())
                         return NULL;
 
-                printk("BUG: MAX_LOCKDEP_ENTRIES too low!\n");
-                printk("turning off the locking correctness validator.\n");
+                print_lockdep_off("BUG: MAX_LOCKDEP_ENTRIES too low!");
                 dump_stack();
                 return NULL;
         }
@@ -2000,7 +2004,7 @@ static inline int lookup_chain_cache(struct task_struct *curr,
         struct lock_class *class = hlock_class(hlock);
         struct list_head *hash_head = chainhashentry(chain_key);
         struct lock_chain *chain;
-        struct held_lock *hlock_curr, *hlock_next;
+        struct held_lock *hlock_curr;
         int i, j;
 
         /*
@@ -2048,8 +2052,7 @@ cache_hit:
                 if (!debug_locks_off_graph_unlock())
                         return 0;
 
-                printk("BUG: MAX_LOCKDEP_CHAINS too low!\n");
-                printk("turning off the locking correctness validator.\n");
+                print_lockdep_off("BUG: MAX_LOCKDEP_CHAINS too low!");
                 dump_stack();
                 return 0;
         }
@@ -2057,12 +2060,10 @@ cache_hit:
         chain->chain_key = chain_key;
         chain->irq_context = hlock->irq_context;
         /* Find the first held_lock of current chain */
-        hlock_next = hlock;
         for (i = curr->lockdep_depth - 1; i >= 0; i--) {
                 hlock_curr = curr->held_locks + i;
-                if (hlock_curr->irq_context != hlock_next->irq_context)
+                if (hlock_curr->irq_context != hlock->irq_context)
                         break;
-                hlock_next = hlock;
         }
         i++;
         chain->depth = curr->lockdep_depth + 1 - i;
@@ -3190,9 +3191,9 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
 #endif
         if (unlikely(curr->lockdep_depth >= MAX_LOCK_DEPTH)) {
                 debug_locks_off();
-                printk("BUG: MAX_LOCK_DEPTH too low, depth: %i  max: %lu!\n",
+                print_lockdep_off("BUG: MAX_LOCK_DEPTH too low!");
+                printk(KERN_DEBUG "depth: %i  max: %lu!\n",
                        curr->lockdep_depth, MAX_LOCK_DEPTH);
-                printk("turning off the locking correctness validator.\n");
 
                 lockdep_print_held_locks(current);
                 debug_show_all_locks();
@@ -4088,7 +4089,7 @@ void debug_check_no_locks_freed(const void *mem_from, unsigned long mem_len)
 }
 EXPORT_SYMBOL_GPL(debug_check_no_locks_freed);
 
-static void print_held_locks_bug(void)
+static void print_held_locks_bug(struct task_struct *curr)
 {
         if (!debug_locks_off())
                 return;
@@ -4097,21 +4098,22 @@ static void print_held_locks_bug(void)
 
         printk("\n");
         printk("=====================================\n");
-        printk("[ BUG: %s/%d still has locks held! ]\n",
-               current->comm, task_pid_nr(current));
+        printk("[ BUG: lock held at task exit time! ]\n");
         print_kernel_ident();
         printk("-------------------------------------\n");
-        lockdep_print_held_locks(current);
+        printk("%s/%d is exiting with locks still held!\n",
+                curr->comm, task_pid_nr(curr));
+        lockdep_print_held_locks(curr);
+
         printk("\nstack backtrace:\n");
         dump_stack();
 }
 
-void debug_check_no_locks_held(void)
+void debug_check_no_locks_held(struct task_struct *task)
 {
-        if (unlikely(current->lockdep_depth > 0))
-                print_held_locks_bug();
+        if (unlikely(task->lockdep_depth > 0))
+                print_held_locks_bug(task);
 }
-EXPORT_SYMBOL_GPL(debug_check_no_locks_held);
 
 void debug_show_all_locks(void)
 {