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; } } From patchwork Mon Nov 5 21:31:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ring X-Patchwork-Id: 10669211 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 9E6B713BF for ; Mon, 5 Nov 2018 21:32:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9952029D70 for ; Mon, 5 Nov 2018 21:32:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DA3629D7C; Mon, 5 Nov 2018 21:32:39 +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 3854729D70 for ; Mon, 5 Nov 2018 21:32:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387913AbeKFGyT (ORCPT ); Tue, 6 Nov 2018 01:54:19 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53780 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387580AbeKFGyT (ORCPT ); Tue, 6 Nov 2018 01:54:19 -0500 Received: by mail-wm1-f65.google.com with SMTP id v24-v6so9857021wmh.3 for ; Mon, 05 Nov 2018 13:32:37 -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=E+exDlkPgNtEH4YrZYb+7mCB23U+gCvDJAVdSeNoMbg=; b=QuzWUuOv4LmUKFw44t18a7wRP+qcOa1ot2wNLj5FX3vnZ55AgTpU0AD4cViOo8xuxt 4fuY1mKwfWJoxTroFfhZyKA48t5X5Y7a2BTnDJdAiPM0q2ZLCQ32zQhbYff3xT93hp1p KgfCDEuTb2d7+ezmRZs3nTPzsdEf5Sc7i5CBYJOp3uvaHjRTxwfSDdLsZhWe4JzLdVw1 MazZb972B0jd+YXveNfUVr2192Ok4bMAl4AnPh5UoA83mEPPRNgyt5/Ilj/FHDLZdkCL moJH128SlnR1b8tOVG1/E3JpEjLBf9d7CaKpidaIz5Ujv/uC/z6jrHZmtMMzgQAf7Gcv I2bA== 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=E+exDlkPgNtEH4YrZYb+7mCB23U+gCvDJAVdSeNoMbg=; b=kPl0KwpTkZJczezhpqhXDmTqZnA2cAAk5moiWB9f8og/NNhHfdRlZP3tfs/+1wPN2m qUVhGJ2O3sQFxgOs46SiQnXBI69kcXnpNs2f6LJOWGgT3/tMj+ZiEoNDvuakaL/f1/3I 3id9NUvtRPKZuZci5rKhHWA0TxZggb8LcrpuqdXuMKcMDiaw8sNCIFYA48Sy46sQq4BX xdu6fL8+kbwUKqQi2kZiyrwXzEQ5HNB9N+a+1r7wFuPfajMLOKLwQWNQkCVjwC/tvfZK DmlnamkZpyXSVXJ/UOnGnfPy5FoRVb5SOJTZyRK/DrMZkOdGES3vdluAMCc4ufRenTNH xlgQ== X-Gm-Message-State: AGRZ1gJN/pSHSisHixQ2aAVsTzOlSNhke5cSeqt8/Aj8gi+dDfNVmmoY PXUp3V54s5TSjzsXxvqH38Ex07jb X-Google-Smtp-Source: AJdET5fPEhSDn7zhv/jyLsOP4dyuVvxreVZ+8C5QZAeVExxkYYlTfSBGOD1S9MiYi3mjx9c0vxBnCA== X-Received: by 2002:a1c:1f4c:: with SMTP id f73-v6mr8152481wmf.56.1541453556470; Mon, 05 Nov 2018 13:32:36 -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.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Nov 2018 13:32:35 -0800 (PST) From: Stefan Ring To: linux-xfs@vger.kernel.org Subject: [PATCH 2/5] xfs_metadump: Zap multi fsb blocks Date: Mon, 5 Nov 2018 22:31:42 +0100 Message-Id: <20181105213145.7560-3-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 Using basically the same code as in process_single_fsb_objects. Signed-off-by: Stefan Ring --- db/metadump.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/db/metadump.c b/db/metadump.c index 97d2a490..be7cf360 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -1881,6 +1881,7 @@ process_multi_fsb_objects( typnm_t btype, xfs_fileoff_t last) { + char *dp; int ret = 0; switch (btype) { @@ -1921,15 +1922,19 @@ 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) { + /* TODO, zap any stale data */ + goto write; + } 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; + iocur_top->need_crc = obfuscate || zero_stale_data; +write: ret = write_buf(iocur_top); out_pop: pop_cur(); From patchwork Mon Nov 5 21:31:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ring X-Patchwork-Id: 10669213 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 4F54113BF for ; Mon, 5 Nov 2018 21:32:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47CBB29D70 for ; Mon, 5 Nov 2018 21:32:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A97129D7D; Mon, 5 Nov 2018 21:32:42 +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 D216729D70 for ; Mon, 5 Nov 2018 21:32:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387932AbeKFGyV (ORCPT ); Tue, 6 Nov 2018 01:54:21 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37925 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387580AbeKFGyV (ORCPT ); Tue, 6 Nov 2018 01:54:21 -0500 Received: by mail-wm1-f67.google.com with SMTP id l2-v6so9544757wmh.3 for ; Mon, 05 Nov 2018 13:32:39 -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=EH7GHTbt43k+64YBQSgnTT91ooRiRCK+vkAMcBpfKR8=; b=gJD2BAZHhvcWgKuuBHzjAPG3GAtoqkEFq5d+m/GIaukN5oqJRM2ePuuXgmrAqzET5J fuRcTNLfB+fD+mCz1dHJKJtZuQ8krnhTbGnWEWDF9ZKkSBpwdp0a0HUx4ZsdJDH2qQsD I3OLPM+o+4gW9LRSml3xTMABWzwP7HKsMtmMZASE3Pjke5w9XqiIfzoCLEkOuxOEr9PT qJdQP9sAsm9w+YUUXKNpGxab8zocOih4fCFaeYt1+82UhNAQMxEGA6NJ3gV9NftYf2F4 Vb8lH5opUz8v1l96gpEqdgmOGDHbcZ8Sjg6lU7kNwKB77PeSwJJ3aIj+hqS987Q8QrU2 fdVw== 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=EH7GHTbt43k+64YBQSgnTT91ooRiRCK+vkAMcBpfKR8=; b=rCuV9kyvWBXIUe/5k+XnqiUFI2Y4zVpFMgwKYn87htFnUFWdSU4CL4yUjfMWNvwevl nSndBKpzntLhVClLbvkdjD12p1MQVr81Vn10gNxKUpiBotIPAZOhY2n0Q3RHeyzh+iZp BrW4rg+9xErpzEBINwZtBfYEK+vx6HHyvaSDAI4JS3kMYvis5C/kzx5nc1gu2vswdT5f dZ2IKerj4lrzrKXHZtiEoAHpLt2/ogtjX5DDmv3poQJ3nOmtMqOM8cuJqmpPv5pt3tXn bS/0DJLfD8ZXm2QiLoJ0WDYe29ZFYlBncZNuvC9eRBudMMRBkVUwqfHgxwDljD/gXdab ktrQ== X-Gm-Message-State: AGRZ1gKjcxNzc7eA/6AcnHK04GOatkqWElBUKsmG+7OhyoSCvJ7U7h15 yPBgLldF5RI91TrwAw6U92QjqwGX X-Google-Smtp-Source: AJdET5dHaZXBdEOEbQItkeiAD+DHVW2/XTjkeaZe8k+EPhnF4lO44jvK52wM5BuTIoGa0JP0XbeWjg== X-Received: by 2002:a1c:f60f:: with SMTP id w15-v6mr8094983wmc.101.1541453558256; Mon, 05 Nov 2018 13:32:38 -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.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Nov 2018 13:32:37 -0800 (PST) From: Stefan Ring To: linux-xfs@vger.kernel.org Subject: [PATCH 3/5] xfs_metadump: Zap freeindex blocks in directory inodes Date: Mon, 5 Nov 2018 22:31:43 +0100 Message-Id: <20181105213145.7560-4-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: Darrick J. Wong --- db/metadump.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/db/metadump.c b/db/metadump.c index be7cf360..d4c751c0 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -1421,6 +1421,43 @@ process_sf_attr( memset(asfep, 0, XFS_DFORK_ASIZE(dip, mp) - ino_attr_size); } +static void +process_dir_free_block( + char *block) +{ + struct xfs_dir2_free *free; + struct xfs_dir3_icfree_hdr freehdr; + + if (!zero_stale_data) + return; + + free = (struct xfs_dir2_free *)block; + M_DIROPS(mp)->free_hdr_from_disk(&freehdr, free); + + switch (freehdr.magic) { + case XFS_DIR2_FREE_MAGIC: + case XFS_DIR3_FREE_MAGIC: { + __be16 *bests; + char *high; + int used; + + /* Zero out space from end of bests[] to end of block */ + bests = M_DIROPS(mp)->free_bests_p(free); + high = (char *)&bests[freehdr.nvalid]; + used = high - (char*)free; + memset(high, 0, mp->m_dir_geo->blksize - used); + iocur_top->need_crc = 1; + break; + } + default: + if (show_warnings) + print_warning("invalid magic in dir inode %llu " + "free block", + (unsigned long long)cur_ino); + break; + } +} + static void process_dir_leaf_block( char *block) @@ -1518,7 +1555,7 @@ process_dir_data_block( if (show_warnings) print_warning( "invalid magic in dir inode %llu block %ld", - (long long)cur_ino, (long)offset); + (unsigned long long)cur_ino, (long)offset); return; } @@ -1832,8 +1869,7 @@ process_single_fsb_objects( switch (btype) { case TYP_DIR2: if (o >= mp->m_dir_geo->freeblk) { - /* TODO, zap any stale data */ - break; + process_dir_free_block(dp); } else if (o >= mp->m_dir_geo->leafblk) { process_dir_leaf_block(dp); } else { @@ -1924,8 +1960,7 @@ process_multi_fsb_objects( dp = iocur_top->data; if (o >= mp->m_dir_geo->freeblk) { - /* TODO, zap any stale data */ - goto write; + process_dir_free_block(dp); } else if (o >= mp->m_dir_geo->leafblk) { process_dir_leaf_block(dp); } else { @@ -1934,7 +1969,6 @@ process_multi_fsb_objects( } iocur_top->need_crc = obfuscate || zero_stale_data; -write: ret = write_buf(iocur_top); out_pop: pop_cur(); From patchwork Mon Nov 5 21:31:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ring X-Patchwork-Id: 10669215 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 6B22A13BF for ; Mon, 5 Nov 2018 21:32:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6590C29D7C for ; Mon, 5 Nov 2018 21:32:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59A4F29D7E; Mon, 5 Nov 2018 21:32:43 +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 EB8CB29D7C for ; Mon, 5 Nov 2018 21:32:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387580AbeKFGyX (ORCPT ); Tue, 6 Nov 2018 01:54:23 -0500 Received: from mail-wr1-f53.google.com ([209.85.221.53]:40909 "EHLO mail-wr1-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387865AbeKFGyW (ORCPT ); Tue, 6 Nov 2018 01:54:22 -0500 Received: by mail-wr1-f53.google.com with SMTP id i17-v6so11164582wre.7 for ; Mon, 05 Nov 2018 13:32:40 -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=n97TryyWB0QoJ95AwbZ3yMH5ymqjEv46h0phsz6/vCo=; b=qz1sWaGJN+iVq6zc8pKVI+nt+RcjCAPvpRPi0+wdxIzYBm5IkspFMQbjp5vu0a8ZJ5 09z1x3NXHkBVr0p/Ee21zaCVBUGCO+TkYUF6C5ioZNUOYGMLcWk81OWrF/7UBl8e/F7k Zf2wIizqYdi48F81qlmx0xf3FmNY86oO/AqZu7IDjGODJ+AWu3aAI7M8ndBHi/PP9JZG ZbgVwaIu5gYcqqpzprbCvtbz6ToCYOxyu4D37gL3wnvDHFoPYdqIANYIVZnIaapXpgJT fX526Co9Mm8eJfnLaY4NhjWcKeIzwsyf3BMPnfzQAh09eMAp5fxXGzfqiEsgLA4d7FbS /T9w== 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=n97TryyWB0QoJ95AwbZ3yMH5ymqjEv46h0phsz6/vCo=; b=g5ouj5eAiNtL3VOpLS4VPZuTICANMoBb1/ZEETGjxfv2jeOfagZ5QK3aGZ/SI3iu7x DDiyIe9M2cSvpF7JhqYaa6RSU0RdJMILYoSIsbBHdjb1UugVrfTJ8c2+c+rpFLOShpF7 ej5rPPA6aJdvh/qnhA2VdpXgkqAfXm7ID3zK06NLeRFg2ap4wEGkyHXFf/LeGcKO3EAT cSe85zBXlXd9q6jxWS79hwDqWGC2jBsnGKtpYV9HWz67MvPKTo1IjME/neDuCIbvzm73 pibks/HewX03gV5PJRbBwD4ez96fQUjlZkZmTmQjxzhXiHgJdNVXnPC1NLeScMU8AJYG FV/A== X-Gm-Message-State: AGRZ1gLJ0vsZ/Sbij0bujtKmgb8fcCzR/0cAqZYs0HK5XqgMgVG+yYdP V77a0NwUoAOaLB4AbH3vTwaXzmBw X-Google-Smtp-Source: AJdET5cBD3tWDd9hiY5MXO5KGvZUPF3YM/apYsJT7p/5pxMbeh8pFt0XLYe6tqa2iKGxhneosQwOaA== X-Received: by 2002:a5d:434c:: with SMTP id u12-v6mr19885266wrr.306.1541453559799; Mon, 05 Nov 2018 13:32:39 -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.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Nov 2018 13:32:39 -0800 (PST) From: Stefan Ring To: linux-xfs@vger.kernel.org Subject: [PATCH 4/5] xfs_metadump: Zap unused space in inode btrees Date: Mon, 5 Nov 2018 22:31:44 +0100 Message-Id: <20181105213145.7560-5-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: Darrick J. Wong --- db/metadump.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/db/metadump.c b/db/metadump.c index d4c751c0..59765263 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -2173,6 +2173,19 @@ process_btinode( } pp = XFS_BMDR_PTR_ADDR(dib, 1, maxrecs); + + if (zero_stale_data) { + char *top; + + /* Unused btree key space */ + top = (char*)XFS_BMDR_KEY_ADDR(dib, nrecs + 1); + memset(top, 0, (char*)pp - top); + + /* Unused btree ptr space */ + top = (char*)&pp[nrecs]; + memset(top, 0, (char*)dib + XFS_DFORK_SIZE(dip, mp, whichfork) - top); + } + for (i = 0; i < nrecs; i++) { xfs_agnumber_t ag; xfs_agblock_t bno; From patchwork Mon Nov 5 21:31:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ring X-Patchwork-Id: 10669217 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 29A4413BF for ; Mon, 5 Nov 2018 21:32:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23E9C29D7C for ; Mon, 5 Nov 2018 21:32:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1834829D7E; Mon, 5 Nov 2018 21:32:44 +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 C0FEB29D7C for ; Mon, 5 Nov 2018 21:32:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387953AbeKFGyX (ORCPT ); Tue, 6 Nov 2018 01:54:23 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:33842 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387865AbeKFGyX (ORCPT ); Tue, 6 Nov 2018 01:54:23 -0500 Received: by mail-wm1-f65.google.com with SMTP id f1-v6so7321162wmg.1 for ; Mon, 05 Nov 2018 13:32:42 -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=EmNJzkVTfuNC7zxFe0K7VHmY5MqyVLrpZ0PqCJiGyHA=; b=NBQWBQkhzf/PpZ2LBSicMttzEgGXpj5ayN2TeR9LXabLUTHxBqeU207EK2dWB/8GqA yefrj0bfQPUAPEUwcjNEXK7Kkza9qJ/t0a9xpuEFXL6g6zNPHwkgWG06riVeR2zTG6Dq YtkGdFCKq+pVPU47ndfqUl8GF21L2x11CuAE9rYO3WQ/4428TtIG2lpXR8hSgNtYBU43 aA458THUoDP6KP9LpRH5a/+5kH24m7smnD+LzdBbarZEEyvpnAfVuOZfFwsWkq7u4LTp MhAjYzoRhJKXJPzQFTGYolwIzs5ZBJIZdlRLbnciCdB+77eU5jRmOCIY2mWcMt1X9vSO idKg== 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=EmNJzkVTfuNC7zxFe0K7VHmY5MqyVLrpZ0PqCJiGyHA=; b=Pe5sfbiswnpBWvvD9gEy9MXp/5vIeFCKQAs0AAtp2G6CRFSW/rpASF5xc0lB3hegGb gr6kpdurjd3ul3K7tddSoI/Q1pH+LjvcOJxxfRv/O7uCi5lhoIX39THqrSnIO/OZeY/d RMN39O3X1nsbZC54+fadjiz2vD8ov1up7oua41/eY7+95XZLxPic2Ear/H5yCc/vO5EU pvi+YSRGrgfwvOjPHzLMrEQkktEYdOPXZA3gOT6cdhZ4sKUGRMogFysDfLjW75dg0yPN GAfV6nZ3x9o8L2AiCQ+yAprIJH7jvjRF5LQ1N+g9SIGOcZimAfSlTj4TtcQb2cQy5VLw xpIQ== X-Gm-Message-State: AGRZ1gJLeGBSp0f+T98LlMtpHK5HlkLpowMxRL8JgsfwOOr2sXxnF9Lk LKWLIUf4X9ELzlMunL9rddw4dkeT X-Google-Smtp-Source: AJdET5fhNNuxQr3n0Lu+vSSyJrdqX1TZH4XxpkwldrpzmNa+1yrBeLPAnzPV/6e1e8ZOhssp3xcuuQ== X-Received: by 2002:a1c:2387:: with SMTP id j129-v6mr7320982wmj.20.1541453561426; Mon, 05 Nov 2018 13:32:41 -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.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Nov 2018 13:32:40 -0800 (PST) From: Stefan Ring To: linux-xfs@vger.kernel.org Subject: [PATCH 5/5] xfs_metadump: Zap dev inodes Date: Mon, 5 Nov 2018 22:31:45 +0100 Message-Id: <20181105213145.7560-6-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: Darrick J. Wong --- db/metadump.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/db/metadump.c b/db/metadump.c index 59765263..57d6bc09 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -2269,6 +2269,25 @@ process_inode_data( return 1; } +static int +process_dev_inode( + xfs_dinode_t *dip) +{ + if (XFS_DFORK_NEXTENTS(dip, XFS_DATA_FORK)) { + if (show_warnings) + print_warning("inode %llu has unexpected extents", + (unsigned long long)cur_ino); + return 0; + } else { + if (zero_stale_data) { + unsigned int size = sizeof(xfs_dev_t); + memset(XFS_DFORK_DPTR(dip) + size, 0, + XFS_DFORK_DSIZE(dip, mp) - size); + } + return 1; + } +} + /* * when we process the inode, we may change the data in the data and/or * attribute fork if they are in short form and we are obfuscating names. @@ -2321,7 +2340,15 @@ process_inode( case S_IFREG: success = process_inode_data(dip, TYP_DATA); break; - default: ; + case S_IFIFO: + case S_IFCHR: + case S_IFBLK: + case S_IFSOCK: + success = process_dev_inode(dip); + need_new_crc = 1; + break; + default: + break; } nametable_clear();