kthread: rename probe_kthread_data() to kthread_probe_data()

[deliverable/linux.git] / kernel / workqueue.c

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index bd81f039027782b923b99be667caa12142c2bf5d..17dad7639b4a3f7569ca219a5bb27e95d7605507 100644 (file)
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4033,6 +4033,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
                for (i = 0; i < WORK_NR_COLORS; i++) {
                        if (WARN_ON(pwq->nr_in_flight[i])) {
                                mutex_unlock(&wq->mutex);
+                               show_workqueue_state();
                                return;
                        }
                }
@@ -4041,6 +4042,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
                    WARN_ON(pwq->nr_active) ||
                    WARN_ON(!list_empty(&pwq->delayed_works))) {
                        mutex_unlock(&wq->mutex);
+                       show_workqueue_state();
                        return;
                }
        }
@@ -4261,7 +4263,7 @@ void print_worker_info(const char *log_lvl, struct task_struct *task)
         * This function is called without any synchronization and @task
         * could be in any state.  Be careful with dereferences.
         */
-       worker = probe_kthread_data(task);
+       worker = kthread_probe_data(task);
 
        /*
         * Carefully copy the associated workqueue's workfn and name.  Keep