Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 349757ce authored by Todd Kjos's avatar Todd Kjos
Browse files

FROMLIST: binder: remove unneeded cleanup code 

(from https://patchwork.kernel.org/patch/9817817/

)

The buffer's transaction has already been freed before
binder_deferred_release. No need to do it again.

Change-Id: I2451a22aee72796d7ca1fc6c1406e22a706200c5
Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
parent f85d229e

drivers/android/binder.c

+2 −9
Original line number Diff line number Diff line
@@ -3632,7 +3632,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,
@@ -3690,14 +3689,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++;