p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: android: check for error from register_shrinker in ion_heap_init_shrinker 

The function register_shrinker in ion_heap_init_shrinker may return an
error, check it out. Meanwhile, ion_heap_init_shrinker has to a return
value.

Signed-off-by: Xiongwei Song <sxwjean@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Xiongwei Song 2017-12-29 20:37:03 +08:00 committed by Greg Kroah-Hartman
parent a941f70e55
commit 47ac54e877
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/android/ion/ion.c
View File

@ -529,6 +529,7 @@ void ion_device_add_heap(struct ion_heap *heap)
{ {
struct dentry *debug_file; struct dentry *debug_file;
struct ion_device *dev = internal_dev; struct ion_device *dev = internal_dev;
int ret;
if (!heap->ops->allocate || !heap->ops->free) if (!heap->ops->allocate || !heap->ops->free)
pr_err("%s: can not add heap with invalid ops struct.\n", pr_err("%s: can not add heap with invalid ops struct.\n",
@ -540,8 +541,11 @@ void ion_device_add_heap(struct ion_heap *heap)
if (heap->flags & ION_HEAP_FLAG_DEFER_FREE) if (heap->flags & ION_HEAP_FLAG_DEFER_FREE)
ion_heap_init_deferred_free(heap); ion_heap_init_deferred_free(heap);
if ((heap->flags & ION_HEAP_FLAG_DEFER_FREE) || heap->ops->shrink) if ((heap->flags & ION_HEAP_FLAG_DEFER_FREE) || heap->ops->shrink) {
ion_heap_init_shrinker(heap); ret = ion_heap_init_shrinker(heap);
if (ret)
pr_err("%s: Failed to register shrinker\n", __func__);
}
heap->dev = dev; heap->dev = dev;
down_write(&dev->lock); down_write(&dev->lock);

2
drivers/staging/android/ion/ion.h
View File

@ -230,7 +230,7 @@ int ion_alloc(size_t len,
* this function will be called to setup a shrinker to shrink the freelists * this function will be called to setup a shrinker to shrink the freelists
* and call the heap's shrink op. * and call the heap's shrink op.
*/ */
void ion_heap_init_shrinker(struct ion_heap *heap); int ion_heap_init_shrinker(struct ion_heap *heap);
/** /**
* ion_heap_init_deferred_free -- initialize deferred free functionality * ion_heap_init_deferred_free -- initialize deferred free functionality

5
drivers/staging/android/ion/ion_heap.c
View File

@ -297,11 +297,12 @@ static unsigned long ion_heap_shrink_scan(struct shrinker *shrinker,
return freed; return freed;
} }
void ion_heap_init_shrinker(struct ion_heap *heap) int ion_heap_init_shrinker(struct ion_heap *heap)
{ {
heap->shrinker.count_objects = ion_heap_shrink_count; heap->shrinker.count_objects = ion_heap_shrink_count;
heap->shrinker.scan_objects = ion_heap_shrink_scan; heap->shrinker.scan_objects = ion_heap_shrink_scan;
heap->shrinker.seeks = DEFAULT_SEEKS; heap->shrinker.seeks = DEFAULT_SEEKS;
heap->shrinker.batch = 0; heap->shrinker.batch = 0;
register_shrinker(&heap->shrinker);
return register_shrinker(&heap->shrinker);
} }