From patchwork Thu Oct 11 19:44:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ring X-Patchwork-Id: 10637283 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 861275CAF for ; Thu, 11 Oct 2018 19:45:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74F6C2C052 for ; Thu, 11 Oct 2018 19:45:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 698192C07A; Thu, 11 Oct 2018 19:45:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 222312C052 for ; Thu, 11 Oct 2018 19:45:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726636AbeJLDNu (ORCPT ); Thu, 11 Oct 2018 23:13:50 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:38584 "EHLO mail-wr1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726054AbeJLDNu (ORCPT ); Thu, 11 Oct 2018 23:13:50 -0400 Received: by mail-wr1-f52.google.com with SMTP id a13-v6so10985632wrt.5 for ; Thu, 11 Oct 2018 12:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=ouM1mD6CRIngZ1ORU0I3jMmf7G9wOswDzSVNrqI0jsk=; b=oXY33OCMFbWBo0vX1XgjrSLR+s9INUFlXj+VgoSOCnhp/6OcMSaea9PcIfQ5XrwFgh MUTA8M30jhZTbTBAvG0UzJhkOmpz9ZFXG+AwqYnhr4f3GdkVYR1jpiiC1DEKehtUuJpH hULAs9npigkGC7Y3cFk81Xs5HMugOpRk76gjEfU4r6Jz8xUxrWk4ohtnsNkFU+SLDnnx azRFbo6jRPEK0Os7le0rOOL+yOL7en2MxxjK0DpkUrYpZDxhL9H6bwBc+ME76/kpMIIZ bRWEpnpBq4QxeM1zeMZRlejTP87K6KwGF/iPr7lHUNl1we8OvuQ5plJPE/AR4U16H8zN zLEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ouM1mD6CRIngZ1ORU0I3jMmf7G9wOswDzSVNrqI0jsk=; b=EGu3JaXm32NZmaLQtkGBeX9bcw7ZZGi+ZSThx5LRmcseD8Anxalf5ZkrAScabBeFmN +M6Xdzv+4v50cQIJ9VXC/bvxfngKyBK3kC+K3pKoVDXN9y65GzPZvPakxSQikz1sf1MP LI1kbay1Z67SXDnRaiJziTn1ejPELyboj1nUVMStomUv5qoAGgOHCevxFH7K7mUY3SeH xFSASjKzAn0nJ4hLn3ywfwVEiqa6hvThiEIDq9PsafDdx+rvJh5zJHb/HS5SqT/4pyCi QHdxsh5T/R8jOIwp9QLzjEDQZkbpj0aX1lNQaSkOIUvtYz+emGf0sSOs6niTnl4XyvTP Z56g== X-Gm-Message-State: ABuFfohWOc5cJc3TeeNUXskwtcLpRttw1T5sxZf5j8xSBarGn6gYMGhS yLb4C7dduwCkfvBUUopUFZ+Z+mqy X-Google-Smtp-Source: ACcGV62DKXAjg4OeQ34kbYE2CcHSs2MlOrc3pGYl4m/4qBJszEZYWZPdsHgUFGRsKI89fP+PsQDhcg== X-Received: by 2002:a5d:52cd:: with SMTP id r13-v6mr2637809wrv.213.1539287105461; Thu, 11 Oct 2018 12:45:05 -0700 (PDT) Received: from dyn.cm.kabsi.at (h081217199198.dyn.cm.kabsi.at. [81.217.199.198]) by smtp.gmail.com with ESMTPSA id x203-v6sm17909785wmg.42.2018.10.11.12.45.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Oct 2018 12:45:04 -0700 (PDT) From: Stefan Ring To: linux-xfs@vger.kernel.org Subject: [PATCH 1/2] xfs_metadump: Extend zapping to multi fsb dir blocks Date: Thu, 11 Oct 2018 21:44:23 +0200 Message-Id: <20181011194424.20306-2-stefanrin@gmail.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20181011194424.20306-1-stefanrin@gmail.com> References: <20181011194424.20306-1-stefanrin@gmail.com> Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The processing for data zeroing was never added to process_multi_fsb_objects. It is now the same thing that process_single_fsb_objects does. --- db/metadump.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/db/metadump.c b/db/metadump.c index cc2ae9af..ff96860d 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -1862,6 +1862,7 @@ process_multi_fsb_objects( typnm_t btype, xfs_fileoff_t last) { + char *dp; int ret = 0; switch (btype) { @@ -1902,14 +1903,16 @@ process_multi_fsb_objects( } - if ((!obfuscate && !zero_stale_data) || - o >= mp->m_dir_geo->leafblk) { - ret = write_buf(iocur_top); - goto out_pop; + dp = iocur_top->data; + if (o >= mp->m_dir_geo->freeblk) { + process_dir_free_block(dp); + } else if (o >= mp->m_dir_geo->leafblk) { + process_dir_leaf_block(dp); + } else { + process_dir_data_block( + dp, o, last == mp->m_dir_geo->fsbcount); } - process_dir_data_block(iocur_top->data, o, - last == mp->m_dir_geo->fsbcount); iocur_top->need_crc = 1; ret = write_buf(iocur_top); out_pop: