Commit e54dd93a authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

modpost: get the *.mod file path more simply 



get_src_version() strips 'o' or 'lto.o' from the end of the object file
path (so, postfixlen is 1 or 5), then adds 'mod'.

If you look at the code closely, mod->name already holds the base path
with the extension stripped.

Most of the code changes made by commit 7ac204b5 ("modpost: lto:
strip .lto from module names") was actually unneeded.

sumversion.c does not need strends(), so it can get back local in
modpost.c again.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 1439ebd2

scripts/mod/modpost.c

+10 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <ctype.h>

#include <string.h>

#include <limits.h>

#include <stdbool.h>

#include <errno.h>

#include "modpost.h"

#include "../../include/linux/license.h"
@@ -89,6 +90,14 @@ modpost_log(enum loglevel loglevel, const char *fmt, ...) 
		error_occurred = true;

}



static inline bool strends(const char *str, const char *postfix)

{

	if (strlen(str) < strlen(postfix))

		return false;



	return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;

}



void *do_nofail(void *ptr, const char *expr)

{

	if (!ptr)
@@ -2060,7 +2069,7 @@ static void read_symbols(const char *modname) 
	if (!mod->is_vmlinux) {

		version = get_modinfo(&info, "version");

		if (version || all_versions)

			get_src_version(modname, mod->srcversion,

			get_src_version(mod->name, mod->srcversion,

					sizeof(mod->srcversion) - 1);

	}

scripts/mod/modpost.h

+0 −9
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <stdarg.h>

#include <stdbool.h>

#include <string.h>

#include <sys/types.h>

#include <sys/stat.h>
@@ -178,14 +177,6 @@ static inline unsigned int get_secindex(const struct elf_info *info, 
	return info->symtab_shndx_start[sym - info->symtab_start];

}



static inline bool strends(const char *str, const char *postfix)

{

	if (strlen(str) < strlen(postfix))

		return false;



	return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;

}



/* file2alias.c */

extern unsigned int cross_build;

void handle_moddevtable(struct module *mod, struct elf_info *info,

scripts/mod/sumversion.c

+1 −6
Original line number Diff line number Diff line
@@ -391,14 +391,9 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) 
	struct md4_ctx md;

	char *fname;

	char filelist[PATH_MAX + 1];

	int postfix_len = 1;



	if (strends(modname, ".lto.o"))

		postfix_len = 5;



	/* objects for a module are listed in the first line of *.mod file. */

	snprintf(filelist, sizeof(filelist), "%.*smod",

		 (int)strlen(modname) - postfix_len, modname);

	snprintf(filelist, sizeof(filelist), "%s.mod", modname);



	buf = read_text_file(filelist);