switch elf_coredump_extra_notes_write() to dump_emit()
Subsystems (5)
RFC PATCH 7/13 switch elf_coredump_extra_notes_write() to dump_emit()
Signed-off-by Al Viro <[email protected]>
--- arch/powerpc/include/asm/spu.h | 3 +- arch/powerpc/platforms/cell/spu_syscalls.c | 5 ++- arch/powerpc/platforms/cell/spufs/coredump.c | 44 ++++++++++---------------- arch/powerpc/platforms/cell/spufs/spufs.h | 3 +- fs/binfmt_elf.c | 7 ++-- include/linux/elf.h | 6 ++-- 6 files changed, 30 insertions(+), 38 deletions(-)
arch/powerpc/include/asm/spu.h +2 -1
@@ -235,6 +235,7 @@ extern long spu_sys_callback(struct spu_syscall_block *s);/* syscalls implemented in spufs */ struct file ; +struct coredump_params ;struct spufs_calls { long (*create_thread)(const char __user *name, unsigned int flags, umode_t mode,
@@ -242,7 +243,7 @@ struct spufs_calls {long (*spu_run)(struct file *filp,__u32 __user *unpc,__u32 __user *ustatus);int (*coredump_extra_notes_size)(void ); -int (*coredump_extra_notes_write)(struct file *file,loff_t *foffset); +int (*coredump_extra_notes_write)(struct coredump_params *cprm);void (*notify_spus_active)(void );struct module *owner; };
arch/powerpc/platforms/cell/spu_syscalls.c +3 -2
@@ -25,6 +25,7 @@#include <linux/module.h> #include <linux/syscalls.h> #include <linux/rcupdate.h> +#include <linux/binfmts.h> #include <asm/spu.h>
@@ -126,7 +127,7 @@ int elf_coredump_extra_notes_size(void)return ret; } -int elf_coredump_extra_notes_write (struct file *file,loff_t *foffset) +int elf_coredump_extra_notes_write (struct coredump_params *cprm) {struct spufs_calls *calls;int ret;
@@ -135,7 +136,7 @@ int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset)if (!calls)return 0 ; - ret = calls->coredump_extra_notes_write (file, foffset); + ret = calls->coredump_extra_notes_write (cprm);spufs_calls_put (calls);
arch/powerpc/platforms/cell/spufs/coredump.c +17 -27
109 lines not on this page · raw message
arch/powerpc/platforms/cell/spufs/spufs.h +2 -1
@@ -247,12 +247,13 @@ extern const struct spufs_tree_descr spufs_dir_debug_contents[];/* system call implementation */ extern struct spufs_calls spufs_calls; +struct coredump_params ;long spufs_run_spu (struct spu_context *ctx,u32 *npc,u32 *status);long spufs_create (struct path *nd,struct dentry *dentry,unsigned int flags,umode_t mode,struct file *filp);/* ELF coredump callbacks for writing SPU ELF notes */ extern int spufs_coredump_extra_notes_size (void ); -extern int spufs_coredump_extra_notes_write (struct file *file,loff_t *foffset); +extern int spufs_coredump_extra_notes_write (struct coredump_params *cprm);extern const struct file_operations spufs_context_fops;
fs/binfmt_elf.c +3 -4
@@ -2037,7 +2037,7 @@ static int elf_core_dump(struct coredump_params *cprm)size_t size =0 ;struct vm_area_struct *vma, *gate_vma;struct elfhdr *elf =NULL ; -loff_t offset =0 , dataoff, foffset; +loff_t offset =0 , dataoff;struct elf_note_info info = { };struct elf_phdr *phdr4note =NULL ;struct elf_shdr *shdr4extnum =NULL ;
@@ -2160,12 +2160,11 @@ static int elf_core_dump(struct coredump_params *cprm)if (!write_note_info (&info, cprm)) goto end_coredump; - foffset = cprm->written; -if (elf_coredump_extra_notes_write (cprm->file, &foffset)) +if (elf_coredump_extra_notes_write (cprm)) goto end_coredump;/* Align to page */ -if (!dump_seek (cprm->file, dataoff - foffset)) +if (!dump_seek (cprm->file, dataoff - cprm->written)) goto end_coredump; cprm->written = size;
include/linux/elf.h +3 -3
@@ -39,13 +39,13 @@ extern Elf64_Dyn _DYNAMIC [];/* Optional callbacks to write extra ELF notes. */ struct file ; +struct coredump_params ;#ifndef ARCH_HAVE_EXTRA_ELF_NOTES static inline int elf_coredump_extra_notes_size (void ) {return 0 ; } -static inline int elf_coredump_extra_notes_write (struct file *file, -loff_t *foffset) {return 0 ; } +static inline int elf_coredump_extra_notes_write (struct coredump_params *cprm) {return 0 ; }#else extern int elf_coredump_extra_notes_size (void ); -extern int elf_coredump_extra_notes_write (struct file *file,loff_t *foffset); +extern int elf_coredump_extra_notes_write (struct coredump_params *cprm);#endif #endif /* _LINUX_ELF_H */
Signature · 1 line
1.7.2.5