aboutsummaryrefslogtreecommitdiffstats
path: root/fs/binfmt_elf.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-09-26 02:32:04 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 11:48:53 -0400
commit8d6b5eeea5eb644232cbbbe1c927fdf051e60fa5 (patch)
tree8ddaf9a7f48d8934cd7cc3dcf2784011fe5999ef /fs/binfmt_elf.c
parentb20c8122a3204496fca8b5343c93b60fe11dad04 (diff)
[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: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/binfmt_elf.c')
-rw-r--r--fs/binfmt_elf.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 672a3b90bc55..64802aabd1ac 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1262,7 +1262,7 @@ static void fill_elf_header(struct elfhdr *elf, int segs)
1262 return; 1262 return;
1263} 1263}
1264 1264
1265static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, off_t offset) 1265static void fill_elf_note_phdr(struct elf_phdr *phdr, int sz, loff_t offset)
1266{ 1266{
1267 phdr->p_type = PT_NOTE; 1267 phdr->p_type = PT_NOTE;
1268 phdr->p_offset = offset; 1268 phdr->p_offset = offset;
@@ -1428,7 +1428,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
1428 int i; 1428 int i;
1429 struct vm_area_struct *vma; 1429 struct vm_area_struct *vma;
1430 struct elfhdr *elf = NULL; 1430 struct elfhdr *elf = NULL;
1431 off_t offset = 0, dataoff; 1431 loff_t offset = 0, dataoff;
1432 unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur; 1432 unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur;
1433 int numnote; 1433 int numnote;
1434 struct memelfnote *notes = NULL; 1434 struct memelfnote *notes = NULL;
@@ -1661,11 +1661,11 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file)
1661 ELF_CORE_WRITE_EXTRA_DATA; 1661 ELF_CORE_WRITE_EXTRA_DATA;
1662#endif 1662#endif
1663 1663
1664 if ((off_t)file->f_pos != offset) { 1664 if (file->f_pos != offset) {
1665 /* Sanity check */ 1665 /* Sanity check */
1666 printk(KERN_WARNING 1666 printk(KERN_WARNING
1667 "elf_core_dump: file->f_pos (%ld) != offset (%ld)\n", 1667 "elf_core_dump: file->f_pos (%Ld) != offset (%Ld)\n",
1668 (off_t)file->f_pos, offset); 1668 file->f_pos, offset);
1669 } 1669 }
1670 1670
1671end_coredump: 1671end_coredump: