From patchwork Thu May 1 23:13:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrick Wong X-Patchwork-Id: 344843 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7F2F8140105 for ; Fri, 2 May 2014 09:13:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752469AbaEAXN7 (ORCPT ); Thu, 1 May 2014 19:13:59 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:39097 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752460AbaEAXN6 (ORCPT ); Thu, 1 May 2014 19:13:58 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s41NDuwJ016024 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 May 2014 23:13:57 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s41NDuAj001507 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 May 2014 23:13:56 GMT Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s41NDub4001501; Thu, 1 May 2014 23:13:56 GMT Received: from localhost (/10.145.179.157) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 01 May 2014 16:13:56 -0700 Subject: [PATCH 14/37] dumpe2fs: add switch to disable checksum verification From: "Darrick J. Wong" To: tytso@mit.edu, darrick.wong@oracle.com Cc: linux-ext4@vger.kernel.org Date: Thu, 01 May 2014 16:13:54 -0700 Message-ID: <20140501231354.31890.36717.stgit@birch.djwong.org> In-Reply-To: <20140501231222.31890.82860.stgit@birch.djwong.org> References: <20140501231222.31890.82860.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Add a -n switch to turn off checksum verification. Signed-off-by: Darrick J. Wong Reviewed-by: Lukas Czerner --- misc/dumpe2fs.8.in | 3 +++ misc/dumpe2fs.c | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/misc/dumpe2fs.8.in b/misc/dumpe2fs.8.in index befaf94..51614db 100644 --- a/misc/dumpe2fs.8.in +++ b/misc/dumpe2fs.8.in @@ -61,6 +61,9 @@ using .I device as the pathname to the image file. .TP +.B \-n +Don't verify checksums when dumping the filesystem. +.TP .B \-x print the detailed group information block numbers in hexadecimal format .TP diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c index ae54f8a..3a3684b 100644 --- a/misc/dumpe2fs.c +++ b/misc/dumpe2fs.c @@ -52,7 +52,7 @@ static int blocks64 = 0; static void usage(void) { - fprintf (stderr, _("Usage: %s [-bfhixV] [-o superblock=] " + fprintf(stderr, _("Usage: %s [-bfhinxV] [-o superblock=] " "[-o blocksize=] device\n"), program_name); exit (1); } @@ -582,7 +582,9 @@ int main (int argc, char ** argv) if (argc && *argv) program_name = *argv; - while ((c = getopt (argc, argv, "bfhixVo:")) != EOF) { + flags = EXT2_FLAG_JOURNAL_DEV_OK | EXT2_FLAG_SOFTSUPP_FEATURES | + EXT2_FLAG_64BITS; + while ((c = getopt(argc, argv, "bfhixVo:n")) != EOF) { switch (c) { case 'b': print_badblocks++; @@ -608,6 +610,9 @@ int main (int argc, char ** argv) case 'x': hex_format++; break; + case 'n': + flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS; + break; default: usage(); } @@ -615,7 +620,6 @@ int main (int argc, char ** argv) if (optind > argc - 1) usage(); device_name = argv[optind++]; - flags = EXT2_FLAG_JOURNAL_DEV_OK | EXT2_FLAG_SOFTSUPP_FEATURES | EXT2_FLAG_64BITS; if (force) flags |= EXT2_FLAG_FORCE; if (image_dump)