From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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) 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 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> In-Reply-To: <20181011194424.20306-1-stefanrin@gmail.com> References: <20181011194424.20306-1-stefanrin@gmail.com> Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: linux-xfs@vger.kernel.org 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: -- 2.14.4