[POWERPC] spufs: Cleanup ELF coredump extra notes logic

To start with, arch_notes_size() etc. is a little too ambiguous a name for
my liking, so change the function names to be more explicit.

Calling through macros is ugly, especially with hidden parameters, so don't
do that, call the routines directly.

Use ARCH_HAVE_EXTRA_ELF_NOTES as the only flag, and based on it decide
whether we want the extern declarations or the empty versions.

Since we have empty routines, actually use them in the coredump code to
save a few #ifdefs.

We want to change the handling of foffset so that the write routine updates
foffset as it goes, instead of using file->f_pos (so that writing to a pipe
works).  So pass foffset to the write routine, and for now just set it to
file->f_pos at the end of writing.

It should also be possible for the write routine to fail, so change it to
return int and treat a non-zero return as failure.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 3 insertions, 11 deletions

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 4482a0673b15..b1013f34085d 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1514,9 +1514,6 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
         int thread_status_size = 0;
         elf_addr_t *auxv;
         unsigned long mm_flags;
-#ifdef ELF_CORE_WRITE_EXTRA_NOTES
-        int extra_notes_size;
-#endif
 
         /*
          * We no longer stop all VM operations.
@@ -1645,10 +1642,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
                 
                 sz += thread_status_size;
 
-#ifdef ELF_CORE_WRITE_EXTRA_NOTES
-                extra_notes_size = ELF_CORE_EXTRA_NOTES_SIZE;
-                sz += extra_notes_size;
-#endif
+                sz += elf_coredump_extra_notes_size();
 
                 fill_elf_note_phdr(&phdr, sz, offset);
                 offset += sz;
@@ -1698,10 +1692,8 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
                 if (!writenote(notes + i, file, &foffset))
                         goto end_coredump;
 
-#ifdef ELF_CORE_WRITE_EXTRA_NOTES
-        ELF_CORE_WRITE_EXTRA_NOTES;
-        foffset += extra_notes_size;
-#endif
+        if (elf_coredump_extra_notes_write(file, &foffset))
+                goto end_coredump;
 
         /* write out the thread status notes section */
         list_for_each(t, &thread_list) {