Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | From | HATAYAMA Daisuke <> | Subject | [PATCH v3 02/21] vmcore: clean up by removing unnecessary variable | Date | Sat, 16 Mar 2013 13:00:58 +0900 |
| |
The variable j has int type but it's compared with u64 type.
Also, the purpose of the variable j is exactly what the variable real_sz is used for now. Replace the variable j by the variable real_sz and remove the variable j.
Signed-off-by: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> ---
fs/proc/vmcore.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 163281e..94743d2 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -261,7 +261,6 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, ehdr_ptr = (Elf64_Ehdr *)elfptr; phdr_ptr = (Elf64_Phdr*)(elfptr + ehdr_ptr->e_phoff); for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { - int j; void *notes_section; struct vmcore *new; u64 offset, max_sz, sz, real_sz = 0; @@ -279,7 +278,7 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, return rc; } nhdr_ptr = notes_section; - for (j = 0; j < max_sz; j += sz) { + while (real_sz < max_sz) { if (nhdr_ptr->n_namesz == 0) break; sz = sizeof(Elf64_Nhdr) + @@ -342,7 +341,6 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, ehdr_ptr = (Elf32_Ehdr *)elfptr; phdr_ptr = (Elf32_Phdr*)(elfptr + ehdr_ptr->e_phoff); for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { - int j; void *notes_section; struct vmcore *new; u64 offset, max_sz, sz, real_sz = 0; @@ -360,7 +358,7 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, return rc; } nhdr_ptr = notes_section; - for (j = 0; j < max_sz; j += sz) { + while (real_sz < max_sz) { if (nhdr_ptr->n_namesz == 0) break; sz = sizeof(Elf32_Nhdr) +
| ![\](/images/icornerr.gif) |