Commit 89334ab4 authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Greg Kroah-Hartman
Browse files

Staging: android: binder: Add some missing binder_stat_br calls 



Cached thread return errors, death notifications and new looper
requests were not included in the stats.

Signed-off-by: default avatarArve Hjønnevåg <arve@android.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 509f3f78

drivers/staging/android/binder.c

+4 −0
Original line number Diff line number Diff line
@@ -2135,6 +2135,7 @@ static int binder_thread_read(struct binder_proc *proc, 
			if (put_user(thread->return_error2, (uint32_t __user *)ptr))

				return -EFAULT;

			ptr += sizeof(uint32_t);

			binder_stat_br(proc, thread, thread->return_error2);

			if (ptr == end)

				goto done;

			thread->return_error2 = BR_OK;
@@ -2142,6 +2143,7 @@ static int binder_thread_read(struct binder_proc *proc, 
		if (put_user(thread->return_error, (uint32_t __user *)ptr))

			return -EFAULT;

		ptr += sizeof(uint32_t);

		binder_stat_br(proc, thread, thread->return_error);

		thread->return_error = BR_OK;

		goto done;

	}
@@ -2297,6 +2299,7 @@ static int binder_thread_read(struct binder_proc *proc, 
			if (put_user(death->cookie, (void * __user *)ptr))

				return -EFAULT;

			ptr += sizeof(void *);

			binder_stat_br(proc, thread, cmd);

			binder_debug(BINDER_DEBUG_DEATH_NOTIFICATION,

				     "binder: %d:%d %s %p\n",

				      proc->pid, thread->pid,
@@ -2404,6 +2407,7 @@ static int binder_thread_read(struct binder_proc *proc, 
			     proc->pid, thread->pid);

		if (put_user(BR_SPAWN_LOOPER, (uint32_t __user *)buffer))

			return -EFAULT;

		binder_stat_br(proc, thread, BR_SPAWN_LOOPER);

	}

	return 0;

}