From patchwork Mon Nov 5 21:31:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ring X-Patchwork-Id: 10669209 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 CE93D13BF for ; Mon, 5 Nov 2018 21:32:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8F0629D70 for ; Mon, 5 Nov 2018 21:32:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC57129D7C; Mon, 5 Nov 2018 21:32:33 +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 A86C929D70 for ; Mon, 5 Nov 2018 21:32:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387600AbeKFGyM (ORCPT ); Tue, 6 Nov 2018 01:54:12 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52500 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387580AbeKFGyM (ORCPT ); Tue, 6 Nov 2018 01:54:12 -0500 Received: by mail-wm1-f66.google.com with SMTP id l66-v6so3701308wml.2 for ; Mon, 05 Nov 2018 13:32:30 -0800 (PST) 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=kCXQpNmaa0k49Mnwur2RoF5FUCc/AedHHskb9FXkScY=; b=r8PkfELt7fRqGbE0BGLxJ+X7BtQxMb+64vU1u0c1iCHQEgtSz9be6vkdRk6NMu50DA e7qdaFRHe/mQXzGcovsLpVtomlWqAQbqYWjgNPNqViOrwGy7Dna8VkKr/PoZPqhrdKd6 fkNE5lFGx7Y0wXdRrqX1d0Wx7zIr3Jwlu5XST3VqAohYrBpfzWfiU13lXLTdBfOKM108 O7sWcDQJOcrL1BtAQpoEhD2mDXJKDu2WH66RjJ/mAYlzq6+r7/CkQj30JEJGXPS2rreu ozHq+ViPQt+rmG2jG4E3wT8dQEMWa4Hx0lXCabAED6EHbV+MKG4gkxwglbjiTNjMVgOV 8dGA== 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=kCXQpNmaa0k49Mnwur2RoF5FUCc/AedHHskb9FXkScY=; b=aCpFhZR26W0HY4StKOz71e5U8CvNC3/udWh/3WPm+YUiLgy3oayHN7jIu21UcwWFNZ Tq8fWKsWIa/Px0Cl5+pGR2drroPb7DsFCHtfyfK8iWJGXOYMU8V4Ut894UassEjaX03w M3LTOUeBgX3cF25z3KMEAQq3ZhcZRoyCVsd5qiKlR16nECqNsrY2oEb/i+g7bG9rANU0 KNf+JUwDME607szSsJeYsSmfTCIj83tZSH90z46ivQ4RdDQDCuVWjEInRW5oACC8vyg6 a3uPH2pl8tK9VCLEZHnGb2hG9KTMiuYEVMsIJh2aWoWulC/HH6kZA5xTOx7s5gybTat2 PhgQ== X-Gm-Message-State: AGRZ1gJ2OWN6aXbEOsU8teUNExvkeXPb66a1bu9STkU+AvLrYih+Q2Qg vkervPeS9i0S6rLLDLqr9oRWUHHs X-Google-Smtp-Source: AJdET5e/E7vkx8VWAfPABnlemBS3iSAJChzUTW1WqSAZ3cxLA1xBXntkZt44tENPJ+fF45Wd/XUhNg== X-Received: by 2002:a1c:f60f:: with SMTP id w15-v6mr8094707wmc.101.1541453549929; Mon, 05 Nov 2018 13:32:29 -0800 (PST) Received: from dyn.cm.kabsi.at (h081217199198.dyn.cm.kabsi.at. [81.217.199.198]) by smtp.gmail.com with ESMTPSA id x18-v6sm38861711wrs.50.2018.11.05.13.32.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Nov 2018 13:32:29 -0800 (PST) From: Stefan Ring To: linux-xfs@vger.kernel.org Subject: [PATCH 1/5] xfs_metadump: Extend data zapping to XFS_DIR{2,3}_LEAFN_MAGIC blocks Date: Mon, 5 Nov 2018 22:31:41 +0100 Message-Id: <20181105213145.7560-2-stefanrin@gmail.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20181105213145.7560-1-stefanrin@gmail.com> References: <20181105213145.7560-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 Signed-off-by: Stefan Ring Reviewed-by: Eric Sandeen --- db/metadump.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/db/metadump.c b/db/metadump.c index cc2ae9af..97d2a490 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -1426,7 +1426,7 @@ process_dir_leaf_block( char *block) { struct xfs_dir2_leaf *leaf; - struct xfs_dir3_icleaf_hdr leafhdr; + struct xfs_dir3_icleaf_hdr leafhdr; if (!zero_stale_data) return; @@ -1435,20 +1435,39 @@ process_dir_leaf_block( leaf = (struct xfs_dir2_leaf *)block; M_DIROPS(mp)->leaf_hdr_from_disk(&leafhdr, leaf); - /* Zero out space from end of ents[] to bests */ - if (leafhdr.magic == XFS_DIR2_LEAF1_MAGIC || - leafhdr.magic == XFS_DIR3_LEAF1_MAGIC) { + switch (leafhdr.magic) { + case XFS_DIR2_LEAF1_MAGIC: + case XFS_DIR3_LEAF1_MAGIC: { struct xfs_dir2_leaf_tail *ltp; __be16 *lbp; struct xfs_dir2_leaf_entry *ents; char *free; /* end of ents */ + /* Zero out space from end of ents[] to bests */ ents = M_DIROPS(mp)->leaf_ents_p(leaf); free = (char *)&ents[leafhdr.count]; ltp = xfs_dir2_leaf_tail_p(mp->m_dir_geo, leaf); lbp = xfs_dir2_leaf_bests_p(ltp); memset(free, 0, (char *)lbp - free); iocur_top->need_crc = 1; + break; + } + case XFS_DIR2_LEAFN_MAGIC: + case XFS_DIR3_LEAFN_MAGIC: { + struct xfs_dir2_leaf_entry *ents; + char *free; + int used; + + /* Zero out space from end of ents[] to end of block */ + ents = M_DIROPS(mp)->leaf_ents_p(leaf); + free = (char *)&ents[leafhdr.count]; + used = free - (char*)leaf; + memset(free, 0, mp->m_dir_geo->blksize - used); + iocur_top->need_crc = 1; + break; + } + default: + break; } }