2020-09-21 02:04:29

by Chen Jun

Subject: [PATCH -next 1/5] mm/kmemleak: make create_object return void

From: Wei Yongjun <[email protected]>

No user cares about the return value of create_object,
so make it return void.

Signed-off-by: Wei Yongjun <[email protected]>
Signed-off-by: Chen Jun <[email protected]>
---
mm/kmemleak.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index c0014d3b91c1..b3f603fd9fc3 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -567,8 +567,8 @@ static int __save_stack_trace(unsigned long *trace)
* Create the metadata (struct kmemleak_object) corresponding to an allocated
* memory block and add it to the object_list and object_tree_root.
*/
-static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
- int min_count, gfp_t gfp)
+static void create_object(unsigned long ptr, size_t size, int min_count,
+ gfp_t gfp)
{
unsigned long flags;
struct kmemleak_object *object, *parent;
@@ -579,7 +579,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
if (!object) {
pr_warn("Cannot allocate a kmemleak_object structure\n");
kmemleak_disable();
- return NULL;
+ return;
}

INIT_LIST_HEAD(&object->object_list);
@@ -640,7 +640,6 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
*/
dump_object_info(parent);
kmem_cache_free(object_cache, object);
- object = NULL;
goto out;
}
}
@@ -650,7 +649,6 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
list_add_tail_rcu(&object->object_list, &object_list);
out:
raw_spin_unlock_irqrestore(&kmemleak_lock, flags);
- return object;
}

/*
--
2.25.0

2020-09-22 09:59:42

by Catalin Marinas

Subject: Re: [PATCH -next 1/5] mm/kmemleak: make create_object return void

On Mon, Sep 21, 2020 at 02:00:03AM +0000, Chen Jun wrote:
> From: Wei Yongjun <[email protected]>
>
> No user cares about the return value of create_object,
> so make it return void.
>
> Signed-off-by: Wei Yongjun <[email protected]>
> Signed-off-by: Chen Jun <[email protected]>

Acked-by: Catalin Marinas <[email protected]>