Commit feb5b784 authored by Luis Chamberlain's avatar Luis Chamberlain
Browse files

module: rename next_string() to module_next_tag_pair() 



This makes it clearer what it is doing. While at it,
make it available to other code other than main.c.
This will be used in the subsequent patch and make
the changes easier to read.

Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent b66973b8

kernel/module/internal.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -96,6 +96,8 @@ long module_get_offset_and_type(struct module *mod, enum mod_mem_type type, 
char *module_flags(struct module *mod, char *buf, bool show_state);

char *module_flags(struct module *mod, char *buf, bool show_state);

size_t module_flags_taint(unsigned long taints, char *buf);

size_t module_flags_taint(unsigned long taints, char *buf);





char *module_next_tag_pair(char *string, unsigned long *secsize);



static inline void module_assert_mutex_or_preempt(void)

static inline void module_assert_mutex_or_preempt(void)

{

{

#ifdef CONFIG_LOCKDEP

#ifdef CONFIG_LOCKDEP

kernel/module/main.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1017,7 +1017,7 @@ int try_to_force_load(struct module *mod, const char *reason) 
}

}





/* Parse tag=value strings from .modinfo section */

/* Parse tag=value strings from .modinfo section */

static char *next_string(char *string, unsigned long *secsize)

char *module_next_tag_pair(char *string, unsigned long *secsize)

{

{

	/* Skip non-zero chars */

	/* Skip non-zero chars */

	while (string[0]) {

	while (string[0]) {
@@ -1051,10 +1051,10 @@ static char *get_next_modinfo(const struct load_info *info, const char *tag, 




	if (prev) {

	if (prev) {

		size -= prev - modinfo;

		size -= prev - modinfo;

		modinfo = next_string(prev, &size);

		modinfo = module_next_tag_pair(prev, &size);

	}

	}





	for (p = modinfo; p; p = next_string(p, &size)) {

	for (p = modinfo; p; p = module_next_tag_pair(p, &size)) {

		if (strncmp(p, tag, taglen) == 0 && p[taglen] == '=')

		if (strncmp(p, tag, taglen) == 0 && p[taglen] == '=')

			return p + taglen + 1;

			return p + taglen + 1;

	}

	}