diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-10-15 19:50:58 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2013-12-13 09:52:42 +0900 |
| commit | 65cffca0a1166682b3d7b44998096f21b39bc5a0 (patch) | |
| tree | a37d6f903a12a79b6581fc2b1afb9d0357cf1863 | |
| parent | 5676baaf3fb0aa37ad7e4de4fbd512c1f8751068 (diff) | |
kexec: Let slurp_file_len() return the number of bytes read
Add an optional output parameter to slurp_file_len() so it can return the
actual number of bytes read.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/i386/crashdump-x86.c | 5 | ||||
| -rw-r--r-- | kexec/kexec.c | 4 | ||||
| -rw-r--r-- | kexec/kexec.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/kexec/arch/i386/crashdump-x86.c b/kexec/arch/i386/crashdump-x86.c index a3eb5ae..ca98165 100644 --- a/kexec/arch/i386/crashdump-x86.c +++ b/kexec/arch/i386/crashdump-x86.c @@ -114,7 +114,7 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info), struct mem_ehdr ehdr; struct mem_phdr *phdr, *end_phdr; int align; - unsigned long size; + off_t size; uint32_t elf_flags = 0; if (elf_info->machine != EM_X86_64) @@ -124,8 +124,7 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info), return 0; align = getpagesize(); - size = KCORE_ELF_HEADERS_SIZE; - buf = slurp_file_len(kcore, size); + buf = slurp_file_len(kcore, KCORE_ELF_HEADERS_SIZE, &size); if (!buf) { fprintf(stderr, "Cannot read %s: %s\n", kcore, strerror(errno)); return -1; diff --git a/kexec/kexec.c b/kexec/kexec.c index 9dc3fa4..d903373 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -537,7 +537,7 @@ char *slurp_file(const char *filename, off_t *r_size) /* This functions reads either specified number of bytes from the file or lesser if EOF is met. */ -char *slurp_file_len(const char *filename, off_t size) +char *slurp_file_len(const char *filename, off_t size, off_t *nread) { int fd; char *buf; @@ -575,6 +575,8 @@ char *slurp_file_len(const char *filename, off_t size) die("Close of %s failed: %s\n", filename, strerror(errno)); } + if (nread) + *nread = progress; return buf; } diff --git a/kexec/kexec.h b/kexec/kexec.h index c8be4a5..2bd6e96 100644 --- a/kexec/kexec.h +++ b/kexec/kexec.h @@ -237,7 +237,7 @@ extern void die(const char *fmt, ...) extern void *xmalloc(size_t size); extern void *xrealloc(void *ptr, size_t size); extern char *slurp_file(const char *filename, off_t *r_size); -extern char *slurp_file_len(const char *filename, off_t size); +extern char *slurp_file_len(const char *filename, off_t size, off_t *nread); extern char *slurp_decompress_file(const char *filename, off_t *r_size); extern unsigned long virt_to_phys(unsigned long addr); extern void add_segment(struct kexec_info *info, |