Commit b955aa70 authored by Liu Shixin's avatar Liu Shixin Committed by Andrew Morton
Browse files

mm/kmemleak: make create_object return void 

No caller cares about the return value of create_object(), so make it
return void.

Link: https://lkml.kernel.org/r/20220901023007.3471887-1-liushixin2@huawei.com


Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 50717ed3

mm/kmemleak.c

+9 −12
Original line number Diff line number Diff line
@@ -604,9 +604,8 @@ static int __save_stack_trace(unsigned long *trace) 
 * memory block and add it to the object_list and object_tree_root (or

 * object_phys_tree_root).

 */

static struct kmemleak_object *__create_object(unsigned long ptr, size_t size,

					     int min_count, gfp_t gfp,

					     bool is_phys)

static void __create_object(unsigned long ptr, size_t size,

			    int min_count, gfp_t gfp, bool is_phys)

{

	unsigned long flags;

	struct kmemleak_object *object, *parent;
@@ -618,7 +617,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);
@@ -687,7 +686,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;

		}

	}
@@ -698,21 +696,20 @@ 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;

}



/* Create kmemleak object which allocated with virtual address. */

static struct kmemleak_object *create_object(unsigned long ptr, size_t size,

static void create_object(unsigned long ptr, size_t size,

			  int min_count, gfp_t gfp)

{

	return __create_object(ptr, size, min_count, gfp, false);

	__create_object(ptr, size, min_count, gfp, false);

}



/* Create kmemleak object which allocated with physical address. */

static struct kmemleak_object *create_object_phys(unsigned long ptr, size_t size,

static void create_object_phys(unsigned long ptr, size_t size,

			       int min_count, gfp_t gfp)

{

	return __create_object(ptr, size, min_count, gfp, true);

	__create_object(ptr, size, min_count, gfp, true);

}



/*