From: Atsushi Kumagai <kumagai-atsushi@xxxxxxxxxxxxxxxxx>
Date: Thu, 23 Aug 2012 17:54:21 +0900
Subject: [PATCH 10/16] [PATCH v3 10/12] Change num_dumped value to global for debug messages.
num_dumped value is used to count the number of dumped pages.
The value is defined as local value and doesn't work correctly for cyclic
mode. (Because the value will be initialized by each cycle.)
This patch fix the above issue.
Signed-off-by: Atsushi Kumagai <kumagai-atsushi at mxc.nes.nec.co.jp>
---
makedumpfile.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/makedumpfile.c b/makedumpfile.c
index 6dfd397..cc90d39 100644
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -44,6 +44,8 @@ unsigned long long pfn_cache_private;
unsigned long long pfn_user;
unsigned long long pfn_free;
+unsigned long long num_dumped;
+
int retcd = FAILED; /* return code */
#define INITIALIZE_LONG_TABLE(table, value) \
@@ -4643,7 +4645,7 @@ write_elf_pages(struct cache_data *cd_header, struct cache_data *cd_page)
int i, phnum;
long page_size = info->page_size;
unsigned long long pfn, pfn_start, pfn_end, paddr, num_excluded;
- unsigned long long num_dumpable, num_dumped = 0, per;
+ unsigned long long num_dumpable, per;
unsigned long long memsz, filesz;
unsigned long frac_head, frac_tail;
off_t off_seg_load, off_memory;
@@ -4988,7 +4990,7 @@ write_elf_pages_cyclic(struct cache_data *cd_header, struct cache_data *cd_page)
long page_size = info->page_size;
unsigned char buf[info->page_size];
unsigned long long pfn, pfn_start, pfn_end, paddr, num_excluded;
- unsigned long long num_dumpable, per, num_dumped=0;
+ unsigned long long num_dumpable, per;
unsigned long long memsz, filesz;
unsigned long frac_head, frac_tail;
off_t off_seg_load, off_memory;
@@ -5205,7 +5207,7 @@ write_elf_pages_cyclic(struct cache_data *cd_header, struct cache_data *cd_page)
int
write_kdump_pages(struct cache_data *cd_header, struct cache_data *cd_page)
{
- unsigned long long pfn, per, num_dumpable, num_dumped = 0;
+ unsigned long long pfn, per, num_dumpable;
unsigned long long start_pfn, end_pfn;
unsigned long size_out;
struct page_desc pd, pd_zero;
@@ -5399,7 +5401,6 @@ write_kdump_pages_cyclic(struct cache_data *cd_header, struct cache_data *cd_pag
struct page_desc pd;
unsigned char buf[info->page_size], *buf_out = NULL;
unsigned long len_buf_out;
- unsigned long long num_dumped=0;
const off_t failed = (off_t)-1;
int ret = FALSE;
@@ -7295,7 +7296,7 @@ reassemble_kdump_pages(void)
off_t offset_first_ph, offset_ph_org, offset_eraseinfo;
off_t offset_data_new, offset_zero_page = 0;
unsigned long long pfn, start_pfn, end_pfn;
- unsigned long long num_dumpable, num_dumped;
+ unsigned long long num_dumpable;
unsigned long size_eraseinfo;
struct dump_bitmap bitmap2;
struct disk_dump_header dh;
--
1.7.9.2
