Staging: android: binder: Create dedicated workqueue for binder deferred work

Some drivers flush the global workqueue when closed. This would deadlock if
the last reference to the file was released from the binder.

Change-Id: Ifdabc0b383fecb20836d1bbb9786c632402a14e1
Signed-off-by: Arve Hjønnevåg <arve@android.com>

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 99010d4b3044b2c33c9d709e334b5be7871b9599..cd53c64f7395cdf1e62f4df2ba706eef5cc0db15 100644 (file)
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -46,6 +46,7 @@ static struct proc_dir_entry *binder_proc_dir_entry_proc;
 static struct binder_node *binder_context_mgr_node;
 static uid_t binder_context_mgr_uid = -1;
 static int binder_last_id;
+static struct workqueue_struct *binder_deferred_workqueue;
 
 static int binder_read_proc_proc(char *page, char **start, off_t off,
                                 int count, int *eof, void *data);
@@ -3099,7 +3100,7 @@ binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer)
        if (hlist_unhashed(&proc->deferred_work_node)) {
                hlist_add_head(&proc->deferred_work_node,
                                &binder_deferred_list);
-               schedule_work(&binder_deferred_work);
+               queue_work(binder_deferred_workqueue, &binder_deferred_work);
        }
        mutex_unlock(&binder_deferred_lock);
 }
@@ -3727,6 +3728,10 @@ static int __init binder_init(void)
 {
        int ret;
 
+       binder_deferred_workqueue = create_singlethread_workqueue("binder");
+       if (!binder_deferred_workqueue)
+               return -ENOMEM;
+
        binder_proc_dir_entry_root = proc_mkdir("binder", NULL);
        if (binder_proc_dir_entry_root)
                binder_proc_dir_entry_proc = proc_mkdir("proc",