diff options
| author | Todd Kjos <tkjos@android.com> | 2017-06-29 12:01:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-17 14:47:28 +0200 |
| commit | 7c03f0d6163a500b655467bd8306d435bef18a83 (patch) | |
| tree | 5fbefb29a19b93656859fe98712d0d2e50c9f0bf /drivers/android | |
| parent | fdfb4a99b6ab8c393db19e3b92968b74ca2757b0 (diff) | |
| download | linux-7c03f0d6163a500b655467bd8306d435bef18a83.tar.bz2 | |
binder: remove unneeded cleanup code
The buffer's transaction has already been freed before
binder_deferred_release. No need to do it again.
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/android')
| -rw-r--r-- | drivers/android/binder.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 1097d056ea6b..2cbd7558fc3f 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -3631,7 +3631,6 @@ static int binder_node_release(struct binder_node *node, int refs) static void binder_deferred_release(struct binder_proc *proc) { - struct binder_transaction *t; struct binder_context *context = proc->context; struct rb_node *n; int threads, nodes, incoming_refs, outgoing_refs, buffers, @@ -3689,14 +3688,8 @@ static void binder_deferred_release(struct binder_proc *proc) buffer = rb_entry(n, struct binder_buffer, rb_node); - t = buffer->transaction; - if (t) { - t->buffer = NULL; - buffer->transaction = NULL; - pr_err("release proc %d, transaction %d, not freed\n", - proc->pid, t->debug_id); - /*BUG();*/ - } + /* Transaction should already have been freed */ + BUG_ON(buffer->transaction); binder_free_buf(proc, buffer); buffers++; |