iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

binder: remove unneeded cleanup code

Browse Source 
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>
This commit is contained in:
Todd Kjos
2017-06-29 12:01:39 -07:00
committed by Greg Kroah-Hartman
parent fdfb4a99b6
commit 7c03f0d616
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/android/binder.c
View File

@ -3631,7 +3631,6 @@ static int binder_node_release(struct binder_node *node, int refs)
static void binder_deferred_release(struct binder_proc *proc) static void binder_deferred_release(struct binder_proc *proc)
{ {
struct binder_transaction *t;
struct binder_context *context = proc->context; struct binder_context *context = proc->context;
struct rb_node *n; struct rb_node *n;
int threads, nodes, incoming_refs, outgoing_refs, buffers, 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); buffer = rb_entry(n, struct binder_buffer, rb_node);
t = buffer->transaction; /* Transaction should already have been freed */
if (t) { BUG_ON(buffer->transaction);
t->buffer = NULL;
buffer->transaction = NULL;
pr_err("release proc %d, transaction %d, not freed\n",
proc->pid, t->debug_id);
/*BUG();*/
}
binder_free_buf(proc, buffer); binder_free_buf(proc, buffer);
buffers++; buffers++;