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();