Commit 4f1354d5 authored by Zhen Lei's avatar Zhen Lei Committed by Luis Chamberlain
Browse files

livepatch: Call klp_match_callback() in klp_find_callback() to avoid code duplication 



The implementation of function klp_match_callback() is identical to the
partial implementation of function klp_find_callback(). So call function
klp_match_callback() in function klp_find_callback() instead of the
duplicated code.

Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Acked-by: default avatarSong Liu <song@kernel.org>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Suggested-by: default avatarPetr Mladek <pmladek@suse.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 169a58ad

kernel/livepatch/core.c

+11 −22
Original line number Diff line number Diff line
@@ -125,20 +125,10 @@ struct klp_find_arg { 
	unsigned long pos;

};



static int klp_find_callback(void *data, const char *name,

			     struct module *mod, unsigned long addr)

static int klp_match_callback(void *data, unsigned long addr)

{

	struct klp_find_arg *args = data;



	if ((mod && !args->objname) || (!mod && args->objname))

		return 0;



	if (strcmp(args->name, name))

		return 0;



	if (args->objname && strcmp(args->objname, mod->name))

		return 0;



	args->addr = addr;

	args->count++;
@@ -153,22 +143,21 @@ static int klp_find_callback(void *data, const char *name, 
	return 0;

}



static int klp_match_callback(void *data, unsigned long addr)

static int klp_find_callback(void *data, const char *name,

			     struct module *mod, unsigned long addr)

{

	struct klp_find_arg *args = data;



	args->addr = addr;

	args->count++;

	if ((mod && !args->objname) || (!mod && args->objname))

		return 0;



	/*

	 * Finish the search when the symbol is found for the desired position

	 * or the position is not defined for a non-unique symbol.

	 */

	if ((args->pos && (args->count == args->pos)) ||

	    (!args->pos && (args->count > 1)))

		return 1;

	if (strcmp(args->name, name))

		return 0;



	if (args->objname && strcmp(args->objname, mod->name))

		return 0;



	return klp_match_callback(data, addr);

}



static int klp_find_object_symbol(const char *objname, const char *name,