From patchwork Fri Oct 26 20:19:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ring X-Patchwork-Id: 10657883 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 CC9DC13A4 for ; Fri, 26 Oct 2018 20:20:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF2932CA67 for ; Fri, 26 Oct 2018 20:20:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B236E2CA6C; Fri, 26 Oct 2018 20:20:11 +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 623662CA67 for ; Fri, 26 Oct 2018 20:20:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727317AbeJ0E6f (ORCPT ); Sat, 27 Oct 2018 00:58:35 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:37758 "EHLO mail-wm1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbeJ0E6f (ORCPT ); Sat, 27 Oct 2018 00:58:35 -0400 Received: by mail-wm1-f51.google.com with SMTP id p2-v6so2530187wmc.2 for ; Fri, 26 Oct 2018 13:20:09 -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=ev8+l9B6bgLeL+PGaUcoBKMonC55YyDOuQhmsJ9DifE=; b=Yg8+36jgQt2Byx9kRwitVHKgNjd3cgYepoPwuEwePqh8bEB3yB2Run79nF9LGbeLmL ZFZeNg/oUcGx/k/paYGX3MUA4q0oZYxt/dYRLNfttFnZ2B8zDJEDC7COR6sRFbngeccg FfFKlYoGSwKIXy1+6xjDCnChBlPsexlpJOUHMteqNAvej1TgE5pYIY6MrbWAkZatpPbn DXFct6lCzO4Qdwe0QnUduyRVnXDf/J/VOeCvMpjhxNPVHDvXGYrHF7rHtn+knmykpRoD KQleGj9p9d45sok0r6QiDduRmPEEQZtR0liqTb+CswQrpC69JV1ES/jWldht7SnOcBwH MYWQ== 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=ev8+l9B6bgLeL+PGaUcoBKMonC55YyDOuQhmsJ9DifE=; b=mHJYz0Mb/79EIlIUseBiuwIUr5WoC8uifREpqnH+6jtm69or/D7Dy0o4hha/Jo3mJF LC8OJXfFvyU+LyNy8gwR4L4ydnqgTtDPyrNQ99TbNorvp6kA0A7pWbdFG7cB4HJ7iumI Tw4h+ZBM2UeMOb/IQwOFuBIaIKfjYH9mdLadUgNM9xP8I4MiOUDWjhbHnw8NmxA8TM2k 24+FmK2+PdjBkyk83xln4U9EdsHfA7qjfNr5jlmBc+dfZbcABEJvZQd7sVEYY+iSXdB5 yf1WwncBMyK5SmnwA1c4uWchDHQ2i5L4e2hFDTdQaXQYxYAU0/0oEvagP8Wkc6+Z+PDL EI9Q== X-Gm-Message-State: AGRZ1gLlbyeh2FLykBrr6byySVvRd55jbQ63G2ONdJLXDLsqTNq5Xr6r eXh7J9zRu16ITKTjQgGbbqqRzAKI X-Google-Smtp-Source: AJdET5fEcv6SPhsBh4I9v3wpPHvc+UpSP2C1DkRibz3S0tB2EcYcXQ4bnbFmu52isKLixIkxpOU6sA== X-Received: by 2002:a1c:3c83:: with SMTP id j125-v6mr633645wma.65.1540585208462; Fri, 26 Oct 2018 13:20:08 -0700 (PDT) Received: from dyn.cm.kabsi.at (h081217199198.dyn.cm.kabsi.at. [81.217.199.198]) by smtp.gmail.com with ESMTPSA id 193-v6sm7669219wmj.21.2018.10.26.13.20.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Oct 2018 13:20:07 -0700 (PDT) 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: Fri, 26 Oct 2018 22:19:39 +0200 Message-Id: <20181026201943.24131-2-stefanrin@gmail.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20181026201943.24131-1-stefanrin@gmail.com> References: <20181026201943.24131-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 --- 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 Fri Oct 26 20:19:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ring X-Patchwork-Id: 10657881 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 8884B15A7 for ; Fri, 26 Oct 2018 20:20:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 789A12CA6B for ; Fri, 26 Oct 2018 20:20:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D2AA2CA6E; Fri, 26 Oct 2018 20:20:13 +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 16EFB2CA6B for ; Fri, 26 Oct 2018 20:20:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727398AbeJ0E6h (ORCPT ); Sat, 27 Oct 2018 00:58:37 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:38933 "EHLO mail-wr1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbeJ0E6g (ORCPT ); Sat, 27 Oct 2018 00:58:36 -0400 Received: by mail-wr1-f43.google.com with SMTP id r10-v6so2539631wrv.6 for ; Fri, 26 Oct 2018 13:20:11 -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=OQ6cuRtwQHsyOo6p0m8upzBRbt3B2kwJbH23KFmJ170=; b=Fehu6Zl4MsxV+/V72gEY5He9hsnLGFBLIrnAX9pmI3N5yo+0Xfzj9JN7e5TVUC2WO1 SDcolXewzk+cXpuRhkN7GdSLfph+WHLpT+U66tCTjqt2wTDAneOwx5I7dmCDQ8xUf03T 7/cxeoTie/zsEigF1A/h4G0WSJKPyuUwwpUmx6byzyVfJ03M8O50OQub/Gr9wdWI0n4z oHILqfFiYlIwI1sgEzWimRlfdWZmK/hp7+5/PwnHNR7glx3MaRFXaFtIdVt+AuVErRnr d8hQvNUzAPULzQgM4J45KzYGpSjUrgoVwxvprGASaJFu8rWYYKQeIfV8uZ/6SjGG25A6 JHCg== 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=OQ6cuRtwQHsyOo6p0m8upzBRbt3B2kwJbH23KFmJ170=; b=FdrfeHsFvzpy7IzAZvXvhFppOmQ81eUK8h7SMrOJMdYUrz1QNKm20tD6wI90OOAsLS 0EDLiATRLIca7zgTkR7ZQlmT7jytFrHWZgDM/xy4Yf+dyfxPWhhYl0aY2Mx69ZP/tn9i 8B0ZsvxmAKgkHyJp6VbI8uGXE5y0Ai5PkMj/+fJMAAwMsaXRE0+YkuImdNFRcR9Nb/5V 1W1ibgnpN12ouaIiEjnlmKsr5PIi94eglCYdMTcan9aisQyY/VWAkeD9oQRkL5Mw1NUE rfMMUUZFXGSLRTxnjLby/vVxMYs2Onng7Io3AfFJrQAwUNqrLIriYiPW0wpSLtPt56fR dZTA== X-Gm-Message-State: AGRZ1gIGxuSXGz0doXmMV4FlieDPi4ttBLwL+y9PwGzp54PEdFIi3JLf O6PilMtZZVN4LI3Zqtm92eTfLoiw X-Google-Smtp-Source: AJdET5eb0KPc83E7UxvycXmoMwqXaBG9jgtN1+3QfwS1UOAz3zosYo30pSHgkYiraXKInXrSLmLlQQ== X-Received: by 2002:a5d:6ac1:: with SMTP id u1-v6mr6375604wrw.175.1540585210327; Fri, 26 Oct 2018 13:20:10 -0700 (PDT) Received: from dyn.cm.kabsi.at (h081217199198.dyn.cm.kabsi.at. [81.217.199.198]) by smtp.gmail.com with ESMTPSA id 193-v6sm7669219wmj.21.2018.10.26.13.20.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Oct 2018 13:20:09 -0700 (PDT) From: Stefan Ring To: linux-xfs@vger.kernel.org Subject: [PATCH 2/5] xfs_metadump: Zap multi fsb blocks Date: Fri, 26 Oct 2018 22:19:40 +0200 Message-Id: <20181026201943.24131-3-stefanrin@gmail.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20181026201943.24131-1-stefanrin@gmail.com> References: <20181026201943.24131-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 the same code as in process_single_fsb_objects. --- db/metadump.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/db/metadump.c b/db/metadump.c index 97d2a490..c1bfc818 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,14 +1922,17 @@ 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 */ + break; + } 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: From patchwork Fri Oct 26 20:19: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: 10657885 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 DDD3813B5 for ; Fri, 26 Oct 2018 20:20:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CED362CA67 for ; Fri, 26 Oct 2018 20:20:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C36742CA6B; Fri, 26 Oct 2018 20:20:19 +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 0EC792CA6C for ; Fri, 26 Oct 2018 20:20:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727745AbeJ0E6j (ORCPT ); Sat, 27 Oct 2018 00:58:39 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54549 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbeJ0E6i (ORCPT ); Sat, 27 Oct 2018 00:58:38 -0400 Received: by mail-wm1-f68.google.com with SMTP id r63-v6so2616539wma.4 for ; Fri, 26 Oct 2018 13:20:12 -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=e3vGFZNPrXzmRoF8t4JUNha0Jbup0kOhGnMB6iV9zRU=; b=OSeQVXyOJDu26ndGGnQmJu4qm43okFCsMlSW9xjaPO1hTPItFTYQshpZmX1dwBhhHF TEveiDmF0JM6ihGFS/kiyNfGlT/BoU/j+Af9l9eIiKYe1dBNgodgVQsZPoSpuZ6wyL+A dO4AuB9keh7FnFRl9Em6ZNqlc2bl7ttFNCGxZhr+ooLkwDU/JJHVwjGmcQLOaS91UWJT ba+/ENiiSx8p7gNX7phRkXnl6x5C/4iDT+NAZ2oxUTtQnxBDwu2M38QPc7Ji+i0S0/H9 8LCRXEwlZI27k7BpIBF6RSZVy7XAJY2WtFbD6RgkzjTXTJNz+1YpX68ZSXZICJ8Ul9fT MFEw== 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=e3vGFZNPrXzmRoF8t4JUNha0Jbup0kOhGnMB6iV9zRU=; b=taMC/WwwR1GSTcnaMqVAmqemIGWSCyQ1IASOg9j/F2ewDTWtuMI1fHjt+uF/K/X902 aDztXccyEqW4ilt7PlXbAuhMwmXDkOA6NkBFP8Adjmh2F3BGMM8WFEa6nl44XGDvaRzf SARwQSxanaYVz8M22Ri9efKJF3yMIlJswEFFFZxBIfBHef758O4ej7ws7ff84KtuXRwm bipB/wzHa/nKBse79ifljeNhjZPo7jOuGcHmOGHdiL3KlTDN3mXztw6Z06ggMKaJITFV xRRxalnorua8lUvdyljt6RblzEdizcDjFNBVcLxiMw9f0GoIyDO/HUhEn4tSdQoqclvj jr4g== X-Gm-Message-State: AGRZ1gI1Sz3cGHk642+LfZGyyTMJLuQE1t7Fyeh1KOG0NtyHJOZDa/wo 4R6D+r8fkpuy2ffrgNg5zRzNjjfu X-Google-Smtp-Source: AJdET5cCTei+LAYF4TtWQ93UBhQl+thn5hxsgWkg1tGkxPParB44EW2LB1Evv5TOeO1BAK7gl97eNQ== X-Received: by 2002:a1c:8d83:: with SMTP id p125-v6mr6782885wmd.61.1540585211953; Fri, 26 Oct 2018 13:20:11 -0700 (PDT) Received: from dyn.cm.kabsi.at (h081217199198.dyn.cm.kabsi.at. [81.217.199.198]) by smtp.gmail.com with ESMTPSA id 193-v6sm7669219wmj.21.2018.10.26.13.20.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Oct 2018 13:20:11 -0700 (PDT) From: Stefan Ring To: linux-xfs@vger.kernel.org Subject: [PATCH 3/5] xfs_metadump: Zap freeindex blocks in directory inodes Date: Fri, 26 Oct 2018 22:19:41 +0200 Message-Id: <20181026201943.24131-4-stefanrin@gmail.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20181026201943.24131-1-stefanrin@gmail.com> References: <20181026201943.24131-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 --- db/metadump.c | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/db/metadump.c b/db/metadump.c index c1bfc818..a4867783 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 */ - break; + process_dir_free_block(dp); } else if (o >= mp->m_dir_geo->leafblk) { process_dir_leaf_block(dp); } else { From patchwork Fri Oct 26 20:19: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: 10657879 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 2496A180E for ; Fri, 26 Oct 2018 20:20:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B4422CA67 for ; Fri, 26 Oct 2018 20:20:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F8512CA6F; Fri, 26 Oct 2018 20:20:16 +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 436F32CA67 for ; Fri, 26 Oct 2018 20:20:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725965AbeJ0E6k (ORCPT ); Sat, 27 Oct 2018 00:58:40 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:53355 "EHLO mail-wm1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727636AbeJ0E6k (ORCPT ); Sat, 27 Oct 2018 00:58:40 -0400 Received: by mail-wm1-f51.google.com with SMTP id l26-v6so2620702wmh.3 for ; Fri, 26 Oct 2018 13:20:14 -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=T61thV06kE9575nDpO1UH+33zrbvpCm1oqtPuxSzXnU=; b=k2MdicMIJ4J6SHhs6w0vsnMyrRufstvTB1glwEN2sh1dRdwrOMvSYVJ2bVz3ja9h+b +1r1NMqw5/5zR698vDoNqcfnDaYg3kawkOS9MA/NsqI1CGdWuDfMEZyQuKJHiV1oOwSA lt5pLjBcPC8PhWzfIGnp7MXarycNqVrsZ7a8ke5u/YFbfIVlGcDkdbI8TIrAamPPzaE6 5QGJbgLW4sNaFxIT9KikYMOAxJP5T6+h2pC2JxHsNqAnceM8VqLDB/Zd7HTyfOCG+3W/ ERPnAiLUnTGZfcD5Zj2PIfVwJq93PNg9o0DcUC3lm90Qbvqt1YCxGBSuwXpyso0QY88V BotQ== 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=T61thV06kE9575nDpO1UH+33zrbvpCm1oqtPuxSzXnU=; b=kxvmV3lb6nc8SRBgj9du/g6JfkL3eeCTUH/+xo/8VehSBPjp1WGUm9WNJA+J4OAoFH xcsvt9xeciZNYmMdMfPWpvTip1+SiDwuDfqHueWObx11BLh/edWY9kbBZYSyHgTWhAK9 fX3aL/S/cHc0UXJgu8gur7KM68qO7DWPVKKy3tqBj7EHek+KLs2d7ObGPUu9r0HMNfrt 2T7G2XFe8YZ3AEju29ezVePANf4LkiCJrMyXrApRpwpcfrdRvo+6nk7xRanUO21KoahO yBk4hWIEQYMl3ielMpHOyhXlAL5njDxVxaEnHgxJPTFnQzxPb8z5dBEH4/MKlR42c9YM VZtQ== X-Gm-Message-State: AGRZ1gI+tM/EIy9svTYszuMN46+d9Q9URhCgHlX5nxBqhuXdr67DE+wc C+RcJ4R568enmAFVk0MYPSD7ljKo X-Google-Smtp-Source: AJdET5eYVi1tSr6PuYNlfDzeUwcYliIOf4q5/99pY/EOmKgmlhAR6+4GJtqdg9JkzLl785uYuXrMcg== X-Received: by 2002:a1c:2dc5:: with SMTP id t188-v6mr6254329wmt.94.1540585213563; Fri, 26 Oct 2018 13:20:13 -0700 (PDT) Received: from dyn.cm.kabsi.at (h081217199198.dyn.cm.kabsi.at. [81.217.199.198]) by smtp.gmail.com with ESMTPSA id 193-v6sm7669219wmj.21.2018.10.26.13.20.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Oct 2018 13:20:12 -0700 (PDT) From: Stefan Ring To: linux-xfs@vger.kernel.org Subject: [PATCH 4/5] xfs_metadump: Zap unused space in inode btrees Date: Fri, 26 Oct 2018 22:19:42 +0200 Message-Id: <20181026201943.24131-5-stefanrin@gmail.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20181026201943.24131-1-stefanrin@gmail.com> References: <20181026201943.24131-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 --- db/metadump.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/db/metadump.c b/db/metadump.c index a4867783..39183fb7 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, 'a', (char*)pp - top); + + /* Unused btree ptr space */ + top = (char*)&pp[nrecs]; + memset(top, 'b', (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 Fri Oct 26 20:19: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: 10657877 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 27AC613B5 for ; Fri, 26 Oct 2018 20:20:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 163692CA6B for ; Fri, 26 Oct 2018 20:20:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A8252CA6F; Fri, 26 Oct 2018 20:20:19 +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 A8A0D2CA6B for ; Fri, 26 Oct 2018 20:20:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727704AbeJ0E6m (ORCPT ); Sat, 27 Oct 2018 00:58:42 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:39903 "EHLO mail-wm1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727636AbeJ0E6m (ORCPT ); Sat, 27 Oct 2018 00:58:42 -0400 Received: by mail-wm1-f52.google.com with SMTP id y144-v6so2532307wmd.4 for ; Fri, 26 Oct 2018 13:20:17 -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=DeAFUUA86KbkTzJO8IqXZGZtI8BYZ3IK08fan0vMkSE=; b=pWCAypa7RshdtH/RM5HZeHnOWTsciGI3TzqNXSkRr3U5i338hWEWG4xxgmLS1W1Ufo zv9QEl1TCJ8MfvkrdkNhpolhBLkgTKZtjfTLv09Nv1gFAoEhQ3sz46XNOerFByQqLWSO ag7Hq2S3nJUl/rGcASwUiZOeSkQ6mYD2ARPR66qK1UHkxfcJ0reHfs3XFeHDXVV0zsak R5VzFcaPJJNVE8aIVtKhhbub/z7Orhg2k4ZGkX57BNfRRtVwnGkfGomJ+ZNkh+9T+h/l jjeBafxrkVdezSsmmeNBI2XtdQOhclQWza+uR8X5lohP3xhRqLXN0hFiKszMc/HBPJVe kLVg== 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=DeAFUUA86KbkTzJO8IqXZGZtI8BYZ3IK08fan0vMkSE=; b=PAeS7PgNkq5F/CxdhSzbYunPrrBwAi367RsTtGXv58vBHTiZQKIqQ13ODRIPm1Cw9T V8lptkWMjbV1FYSUPQ9CzBAGEPru5sbPFFdEqocCyW8hNJkF+Bi+SX6S2kN06Q2vzIRr KaoDPa/IBEjq8iqq8JsTHiumxTWzqO1k/yl0TNAZQeRRETuo22LZKegromMZqMsDuX5S awI32+mcTwk4wco5j+dyCkPulD4J4rOvWZRe019qyvpEDhKgOfdoToTi35HBIBEYU3Hd uyvOGXJ+7u2W41Fz6MVgtGHwHi2/z3oSt6a76QU0zHHB8WHEcjST83LjwFMJE0Rolor5 1OSg== X-Gm-Message-State: AGRZ1gKUoT5GVvj9OfTTR3H3+xbpWcbec2eLTmxc/fiHjyY8iSQpFttq vnKVSh57w9fSTCbCs0FfED3FzBAE X-Google-Smtp-Source: AJdET5fB2Siqlj59VEm/GeKAiElAF6Tygy0FT5kyjSKVtbfX95gqAIjBOOlAM8LF1x+Tb6sa/IPLEw== X-Received: by 2002:a1c:9b05:: with SMTP id d5-v6mr3177600wme.90.1540585216110; Fri, 26 Oct 2018 13:20:16 -0700 (PDT) Received: from dyn.cm.kabsi.at (h081217199198.dyn.cm.kabsi.at. [81.217.199.198]) by smtp.gmail.com with ESMTPSA id 193-v6sm7669219wmj.21.2018.10.26.13.20.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Oct 2018 13:20:15 -0700 (PDT) From: Stefan Ring To: linux-xfs@vger.kernel.org Subject: [PATCH 5/5] xfs_metadump: Zap dev inodes Date: Fri, 26 Oct 2018 22:19:43 +0200 Message-Id: <20181026201943.24131-6-stefanrin@gmail.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20181026201943.24131-1-stefanrin@gmail.com> References: <20181026201943.24131-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 --- db/metadump.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/db/metadump.c b/db/metadump.c index 39183fb7..bdc6f2f4 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -2269,6 +2269,24 @@ process_inode_data( return 1; } +static int +process_dev_inode( + xfs_dinode_t *dip) +{ + if (XFS_DFORK_NEXTENTS(dip, XFS_ATTR_FORK) || + 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 { + int used = XFS_DFORK_DPTR(dip) - (char*)dip; + + memset(XFS_DFORK_DPTR(dip), 0, mp->m_sb.sb_inodesize - used); + 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 +2339,9 @@ process_inode( case S_IFREG: success = process_inode_data(dip, TYP_DATA); break; - default: ; + default: + success = process_dev_inode(dip); + break; } nametable_clear();