|
 |
a6d77e |
Return-Path: yishimat@redhat.com
|
|
|
a6d77e |
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
|
|
|
a6d77e |
zmta02.collab.prod.int.phx2.redhat.com) (10.5.81.9) by
|
|
|
a6d77e |
zmail24.collab.prod.int.phx2.redhat.com with LMTP; Thu, 2 Jul 2015 01:16:42
|
|
|
a6d77e |
-0400 (EDT)
|
|
|
a6d77e |
Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27])
|
|
|
a6d77e |
by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 9997C122359;
|
|
|
a6d77e |
Thu, 2 Jul 2015 01:16:42 -0400 (EDT)
|
|
|
a6d77e |
Received: from [10.3.112.13] ([10.3.112.13])
|
|
|
a6d77e |
by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t625Geo3028836;
|
|
|
a6d77e |
Thu, 2 Jul 2015 01:16:41 -0400
|
|
|
a6d77e |
Subject: [RHEL7.2 PATCH resend v3 4/4] Fix reassemble_kdump_header().
|
|
|
a6d77e |
To: kexec-kdump-list@redhat.com
|
|
|
a6d77e |
References: <55929BD5.7050709@redhat.com> <5594C856.6050503@redhat.com>
|
|
|
a6d77e |
Cc: Minfei Huang <mhuang@redhat.com>, bhe@redhat.com, yishimat@redhat.com
|
|
|
a6d77e |
From: Yasuaki Ishimatsu <yishimat@redhat.com>
|
|
|
a6d77e |
Message-ID: <5594C937.2060303@redhat.com>
|
|
|
a6d77e |
Date: Thu, 2 Jul 2015 01:16:39 -0400
|
|
|
a6d77e |
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101
|
|
|
a6d77e |
Thunderbird/38.0.1
|
|
|
a6d77e |
MIME-Version: 1.0
|
|
|
a6d77e |
In-Reply-To: <5594C856.6050503@redhat.com>
|
|
|
a6d77e |
Content-Type: text/plain; charset=utf-8
|
|
|
a6d77e |
Content-Transfer-Encoding: 7bit
|
|
|
a6d77e |
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27
|
|
|
a6d77e |
Content-Length: 1349
|
|
|
a6d77e |
|
|
|
a6d77e |
https://bugzilla.redhat.com/show_bug.cgi?id=1182377
|
|
|
a6d77e |
|
|
|
a6d77e |
The patch is back ported directory from the following upstream commit:
|
|
|
a6d77e |
|
|
|
a6d77e |
commit 45a1885e747c3833d5df770d0f2c5571a838f55a
|
|
|
a6d77e |
Author: Zhou Wenjian <zhouwj-fnst@cn.fujitsu.com>
|
|
|
a6d77e |
Date: Mon Oct 20 13:40:10 2014 +0900
|
|
|
a6d77e |
|
|
|
a6d77e |
[PATCH v4 4/4] Fix reassemble_kdump_header().
|
|
|
a6d77e |
|
|
|
a6d77e |
Fix it to take over incomplete flags of all dump file.
|
|
|
a6d77e |
|
|
|
a6d77e |
Singed-of-by: Zhou Wenjian <zhouwj-fnst@cn.fujitsu.com>
|
|
|
a6d77e |
|
|
|
a6d77e |
Resolves: rhbz#1182377
|
|
|
a6d77e |
Signed-off-by: Yasuaki Ishimatsu <yishimat@redhat.com>
|
|
|
a6d77e |
Acked-by: Minfei Huang <mhuang@redhat.com>
|
|
|
a6d77e |
|
|
|
a6d77e |
---
|
|
|
a6d77e |
makedumpfile-1.5.7/makedumpfile.c | 10 ++++++++--
|
|
|
a6d77e |
1 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
a6d77e |
|
|
|
a6d77e |
diff --git a/makedumpfile-1.5.7/makedumpfile.c b/makedumpfile-1.5.7/makedumpfile.c
|
|
|
a6d77e |
index 4dba83e..f072069 100644
|
|
|
a6d77e |
--- a/makedumpfile-1.5.7/makedumpfile.c
|
|
|
a6d77e |
+++ b/makedumpfile-1.5.7/makedumpfile.c
|
|
|
a6d77e |
@@ -8695,8 +8695,14 @@ reassemble_kdump_header(void)
|
|
|
a6d77e |
/*
|
|
|
a6d77e |
* Write common header.
|
|
|
a6d77e |
*/
|
|
|
a6d77e |
- if (!read_disk_dump_header(&dh, SPLITTING_DUMPFILE(0)))
|
|
|
a6d77e |
- return FALSE;
|
|
|
a6d77e |
+ int i;
|
|
|
a6d77e |
+ for ( i = 0; i < info->num_dumpfile; i++){
|
|
|
a6d77e |
+ if (!read_disk_dump_header(&dh, SPLITTING_DUMPFILE(i)))
|
|
|
a6d77e |
+ return FALSE;
|
|
|
a6d77e |
+ int status = dh.status & DUMP_DH_COMPRESSED_INCOMPLETE;
|
|
|
a6d77e |
+ if (status)
|
|
|
a6d77e |
+ break;
|
|
|
a6d77e |
+ }
|
|
|
a6d77e |
|
|
|
a6d77e |
if (lseek(info->fd_dumpfile, 0x0, SEEK_SET) < 0) {
|
|
|
a6d77e |
ERRMSG("Can't seek a file(%s). %s\n",
|
|
|
a6d77e |
--
|
|
|
a6d77e |
1.7.1
|
|
|
a6d77e |
|