The pathname is already in the elf_file struct.
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
---
depmod.c | 2 +-
elfops.h | 4 ++--
elfops_core.c | 5 ++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/depmod.c b/depmod.c
index 68fcaee..ba405fe 100644
--- a/depmod.c
+++ b/depmod.c
@@ -656,7 +656,7 @@ static void calculate_deps(struct module *module)
module->deps = NULL;
file = module->file;
- symnames = file->ops->load_dep_syms(module->pathname, file, &symtypes);
+ symnames = file->ops->load_dep_syms(file, &symtypes);
if (!symnames || !symtypes)
return;
diff --git a/elfops.h b/elfops.h
index 2921e52..6cdfc07 100644
--- a/elfops.h
+++ b/elfops.h
@@ -65,8 +65,8 @@ struct module_ops
struct string_table *(*load_strings)(struct elf_file *module,
const char *secname, struct string_table *tbl, errfn_t error);
struct string_table *(*load_symbols)(struct elf_file *module);
- struct string_table *(*load_dep_syms)(const char *pathname,
- struct elf_file *module, struct string_table **types);
+ struct string_table *(*load_dep_syms)(struct elf_file *module,
+ struct string_table **types);
void (*fetch_tables)(struct elf_file *module,
struct module_tables *tables);
char *(*get_aliases)(struct elf_file *module, unsigned long *size);
diff --git a/elfops_core.c b/elfops_core.c
index ced374e..5df9f25 100644
--- a/elfops_core.c
+++ b/elfops_core.c
@@ -122,8 +122,7 @@ static char *PERBIT(get_modinfo)(struct elf_file *module, unsigned long *size)
#define STT_REGISTER 13 /* Global register reserved to app. */
#endif
-static struct string_table *PERBIT(load_dep_syms)(const char *pathname,
- struct elf_file *module,
+static struct string_table *PERBIT(load_dep_syms)(struct elf_file *module,
struct string_table **types)
{
unsigned int i;
@@ -143,7 +142,7 @@ static struct string_table *PERBIT(load_dep_syms)(const char *pathname,
if (!strings || !syms) {
warn("Couldn't find symtab and strtab in module %s\n",
- pathname);
+ module->pathname);
return NULL;
}
--
1.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
