Commit 8d6b5eee authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] binfmt_elf: consistently use loff_t



As David Howells <dhowells@redhat.com> points out, binfmt_elf sometimes uses
off_t, sometimes uses loff_t.  Use loff_t throughout.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b20c8122
...@@ -1262,7 +1262,7 @@ static void fill_elf_header(struct elfhdr *elf, int segs) ...@@ -1262,7 +1262,7 @@ static void fill_elf_header(struct elfhdr *elf, int segs)
return; return;
} }
static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, off_t offset) static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)
{ {
phdr->p_type = PT_NOTE; phdr->p_type = PT_NOTE;
phdr->p_offset = offset; phdr->p_offset = offset;
...@@ -1428,7 +1428,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file) ...@@ -1428,7 +1428,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
int i; int i;
struct vm_area_struct *vma; struct vm_area_struct *vma;
struct elfhdr *elf = NULL; struct elfhdr *elf = NULL;
off_t offset = 0, dataoff; loff_t offset = 0, dataoff;
unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur; unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur;
int numnote; int numnote;
struct memelfnote *notes = NULL; struct memelfnote *notes = NULL;
...@@ -1661,11 +1661,11 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file) ...@@ -1661,11 +1661,11 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
ELF_CORE_WRITE_EXTRA_DATA; ELF_CORE_WRITE_EXTRA_DATA;
#endif #endif
if ((off_t)file->f_pos != offset) { if (file->f_pos != offset) {
/* Sanity check */ /* Sanity check */
printk(KERN_WARNING printk(KERN_WARNING
"elf_core_dump: file->f_pos (%ld) != offset (%ld)\n", "elf_core_dump: file->f_pos (%Ld) != offset (%Ld)\n",
(off_t)file->f_pos, offset); file->f_pos, offset);
} }
end_coredump: end_coredump:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment