objtool: Rename elf_read() to elf_open_read()

'struct elf *' handling is an open/close paradigm, make sure the naming
matches that:

   elf_open_read()
   elf_write()
   elf_close()

Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sami Tolvanen <samitolvanen@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20200422103205.61900-3-mingo@kernel.org

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index f2a84271e8073930ba098f1e54419efb6ead5f6f..12e2aea42bb262ce749282ad1da749eee1686743 100644 (file)
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2614,7 +2614,7 @@ int check(const char *_objname, bool orc)
 
        objname = _objname;
 
-       file.elf = elf_read(objname, orc ? O_RDWR : O_RDONLY);
+       file.elf = elf_open_read(objname, orc ? O_RDWR : O_RDONLY);
        if (!file.elf)
                return 1;
 

diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index fab5534c336577cd9a9b2fbc40d61c18e45162c3..453b723c89d5a78c8cdbfd5327590afcd2bac228 100644 (file)
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -542,7 +542,7 @@ static int read_relas(struct elf *elf)
        return 0;
 }
 
-struct elf *elf_read(const char *name, int flags)
+struct elf *elf_open_read(const char *name, int flags)
 {
        struct elf *elf;
        Elf_Cmd cmd;

diff --git a/tools/objtool/elf.h b/tools/objtool/elf.h
index a55bcde9f1b1326455ab589855f0908141153e96..5e76ac38cf9933e839071ee778e4ceeb32103b6f 100644 (file)
--- a/tools/objtool/elf.h
+++ b/tools/objtool/elf.h
@@ -113,7 +113,7 @@ static inline u32 rela_hash(struct rela *rela)
        return sec_offset_hash(rela->sec, rela->offset);
 }
 
-struct elf *elf_read(const char *name, int flags);
+struct elf *elf_open_read(const char *name, int flags);
 struct section *elf_create_section(struct elf *elf, const char *name, size_t entsize, int nr);
 struct section *elf_create_rela_section(struct elf *elf, struct section *base);
 void elf_add_rela(struct elf *elf, struct rela *rela);