evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FROMLIST: android: binder: Refactor prev and next buffer into a helper function

Browse source 
(from https://patchwork.kernel.org/patch/9928605/)

Use helper functions buffer_next and buffer_prev instead
of list_entry to get the next and previous buffers.

Bug: 36007193
Change-Id: I422dce84afde3d2138a6d976593b109a9cc49003
Signed-off-by: Sherry Yang <sherryy@android.com>
This commit is contained in:
Sherry Yang 2017-06-30 10:22:23 -07:00 • committed by Mengjiao Yang
parent 9c4d6ba998
commit 0e05bd2dc0
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/android/binder_alloc.c
View file

@ -48,14 +48,23 @@ module_param_named(debug_mask, binder_alloc_debug_mask,
pr_info(x); \ pr_info(x); \
} while (0) } while (0)
static struct binder_buffer *binder_buffer_next(struct binder_buffer *buffer)
{
return list_entry(buffer->entry.next, struct binder_buffer, entry);
}
static struct binder_buffer *binder_buffer_prev(struct binder_buffer *buffer)
{
return list_entry(buffer->entry.prev, struct binder_buffer, entry);
}
static size_t binder_alloc_buffer_size(struct binder_alloc *alloc, static size_t binder_alloc_buffer_size(struct binder_alloc *alloc,
struct binder_buffer *buffer) struct binder_buffer *buffer)
{ {
if (list_is_last(&buffer->entry, &alloc->buffers)) if (list_is_last(&buffer->entry, &alloc->buffers))
return alloc->buffer + return alloc->buffer +
alloc->buffer_size - (void *)buffer->data; alloc->buffer_size - (void *)buffer->data;
return (size_t)list_entry(buffer->entry.next, return (size_t)binder_buffer_next(buffer) - (size_t)buffer->data;
struct binder_buffer, entry) - (size_t)buffer->data;
} }
static void binder_insert_free_buffer(struct binder_alloc *alloc, static void binder_insert_free_buffer(struct binder_alloc *alloc,
@ -470,7 +479,7 @@ static void binder_delete_free_buffer(struct binder_alloc *alloc,
int free_page_start = 1; int free_page_start = 1;
BUG_ON(alloc->buffers.next == &buffer->entry); BUG_ON(alloc->buffers.next == &buffer->entry);
prev = list_entry(buffer->entry.prev, struct binder_buffer, entry); prev = binder_buffer_prev(buffer);
BUG_ON(!prev->free); BUG_ON(!prev->free);
if (buffer_end_page(prev) == buffer_start_page(buffer)) { if (buffer_end_page(prev) == buffer_start_page(buffer)) {
free_page_start = 0; free_page_start = 0;
@ -482,8 +491,7 @@ static void binder_delete_free_buffer(struct binder_alloc *alloc,
} }
if (!list_is_last(&buffer->entry, &alloc->buffers)) { if (!list_is_last(&buffer->entry, &alloc->buffers)) {
next = list_entry(buffer->entry.next, next = binder_buffer_next(buffer);
struct binder_buffer, entry);
if (buffer_start_page(next) == buffer_end_page(buffer)) { if (buffer_start_page(next) == buffer_end_page(buffer)) {
free_page_end = 0; free_page_end = 0;
if (buffer_start_page(next) == if (buffer_start_page(next) ==
@ -544,8 +552,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc,
rb_erase(&buffer->rb_node, &alloc->allocated_buffers); rb_erase(&buffer->rb_node, &alloc->allocated_buffers);
buffer->free = 1; buffer->free = 1;
if (!list_is_last(&buffer->entry, &alloc->buffers)) { if (!list_is_last(&buffer->entry, &alloc->buffers)) {
struct binder_buffer *next = list_entry(buffer->entry.next, struct binder_buffer *next = binder_buffer_next(buffer);
struct binder_buffer, entry);
if (next->free) { if (next->free) {
rb_erase(&next->rb_node, &alloc->free_buffers); rb_erase(&next->rb_node, &alloc->free_buffers);
@ -553,8 +560,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc,
} }
} }
if (alloc->buffers.next != &buffer->entry) { if (alloc->buffers.next != &buffer->entry) {
struct binder_buffer *prev = list_entry(buffer->entry.prev, struct binder_buffer *prev = binder_buffer_prev(buffer);
struct binder_buffer, entry);
if (prev->free) { if (prev->free) {
binder_delete_free_buffer(alloc, buffer); binder_delete_free_buffer(alloc, buffer);