korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-03 00:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

module: rename next_string() to module_next_tag_pair()

Browse Source 
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: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
Luis Chamberlain 2023-03-19 14:27:36 -07:00
parent b66973b82d
commit feb5b784a2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/module/internal.h
View File

@ -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

6
kernel/module/main.c
View File

@ -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;
} }