OSDN Git Service

staging: android: check for error from register_shrinker in ion_heap_init_shrinker
authorXiongwei Song <sxwjean@gmail.com>
Fri, 29 Dec 2017 12:37:03 +0000 (20:37 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jan 2018 15:37:18 +0000 (16:37 +0100)
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>
drivers/staging/android/ion/ion.c
drivers/staging/android/ion/ion.h
drivers/staging/android/ion/ion_heap.c

index bb2c4b0..57e0d80 100644 (file)
@@ -529,6 +529,7 @@ void ion_device_add_heap(struct ion_heap *heap)
 {
        struct dentry *debug_file;
        struct ion_device *dev = internal_dev;
+       int ret;
 
        if (!heap->ops->allocate || !heap->ops->free)
                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)
                ion_heap_init_deferred_free(heap);
 
-       if ((heap->flags & ION_HEAP_FLAG_DEFER_FREE) || heap->ops->shrink)
-               ion_heap_init_shrinker(heap);
+       if ((heap->flags & ION_HEAP_FLAG_DEFER_FREE) || heap->ops->shrink) {
+               ret = ion_heap_init_shrinker(heap);
+               if (ret)
+                       pr_err("%s: Failed to register shrinker\n", __func__);
+       }
 
        heap->dev = dev;
        down_write(&dev->lock);
index c24c6e2..a238f23 100644 (file)
@@ -230,7 +230,7 @@ int ion_alloc(size_t len,
  * this function will be called to setup a shrinker to shrink the freelists
  * 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
index 2af86a2..772dad6 100644 (file)
@@ -297,11 +297,12 @@ static unsigned long ion_heap_shrink_scan(struct shrinker *shrinker,
        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.scan_objects = ion_heap_shrink_scan;
        heap->shrinker.seeks = DEFAULT_SEEKS;
        heap->shrinker.batch = 0;
-       register_shrinker(&heap->shrinker);
+
+       return register_shrinker(&heap->shrinker);
 }