From patchwork Mon Oct 9 01:51:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9992107 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E36B7602D7 for ; Mon, 9 Oct 2017 01:51:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E269228623 for ; Mon, 9 Oct 2017 01:51:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D78042863B; Mon, 9 Oct 2017 01:51:35 +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=-6.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, 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 7D66728623 for ; Mon, 9 Oct 2017 01:51:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752185AbdJIBv0 (ORCPT ); Sun, 8 Oct 2017 21:51:26 -0400 Received: from mout.gmx.net ([212.227.17.20]:55261 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751397AbdJIBvX (ORCPT ); Sun, 8 Oct 2017 21:51:23 -0400 Received: from localhost.localdomain ([104.207.157.105]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MhMg2-1dejlX3WOQ-00MbJb; Mon, 09 Oct 2017 03:51:18 +0200 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, nborisov@suse.com Subject: [PATCH v4 4/5] btrfs: tree-checker: Enhance output for check_csum_item Date: Mon, 9 Oct 2017 01:51:05 +0000 Message-Id: <20171009015106.9711-5-quwenruo.btrfs@gmx.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171009015106.9711-1-quwenruo.btrfs@gmx.com> References: <20171009015106.9711-1-quwenruo.btrfs@gmx.com> X-Provags-ID: V03:K0:5r/7FZmS48nqqIIY885Tl7MeqhnNT6lPzmRGNurL79ak3H+CMT7 FVN/rysgIDv2JalWW3bfETdvFF78HMHonqnIgVVyhaOSrqQxJ0FFty99rZ4R0Y18z9Jxr9G rzTCLpnk5QsKYSgkIWIGJdLwyt9QV7Ddv7MiWwJ0Z0aGBhr7umn1dpvy0ODClvroHs5MnUZ k9QR7PWY9Tsb5OT+c/5SQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:EdJ0huicSIw=:AdwtprqFBgqvscakYtHonl 8Uf9Y757Bo/9UC0U1ci1o46cXLkOYyT22T3eMFr87w+6u3AAK+vlQco3abkyPdGapLj+/L1+y YbdVTkh5rN5UdW6bPs5q2S5isPiAiKvKemkrjetMC2W5urzB3v/ExDvTau1fbxlvXjFRIaieH fS1LBuC2shXA/cq9CeZFXsOpbybKn/itxud9XR1WEExzHptICYEmdCsMFhMNny+XLcKft91CS 9cnaqgC3yybU77OVV3mD04p3QJcsNAOEZ+cXhep+emM5Y/501HXEciZ/lQFfvv8u+LMq54uGw E7Dm0TR7NovRKZfK6rM9uH1NWbcfd4sJMPQKJv7JZJjxMflCKM8TDTvBpunhoM0Rpb879bRoT JR/6R/jR5d0Eyc+tSt1IQFmkDymhkgu5JD1rbu/IM1retIsU5HUb6jeX/871u8J2U/BAvTIMi rUXKFfw3raloRgVQW2FguXW//WwrlVdCXnXKhYtpqAFa1nIasTYWziHNnx2fc1VOFGzuzBauK spxWaBet7tNd38TIsxjacO2GEnUKqA5xAmF1a+pS514KQlF6VeBrlM061pxTkYkcRrKXZGgzu uVQvF7hhiK+3iHCXyPC/CpS6b/ArfOToL5abcWh1a9R1InQag8Qcjc+dcnM3m+9RUDDsS3LtO AgDSrpxF3YVLj9rbnC7ihtUVQa89VxVmigEYOckB7ukVw/HJDDhlzTXU71csqk7c9FRcJX/a4 DKPKgNVsFaJJooyNnOBdZ/Y0Hk0GsAe1TqDViTHmf6UIVzjFnmJkVrwRy4yh6jJq2A+5EGKEa S+AAHOufVlXeFpbDq3CaHYO3/3auA== Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Output the bad value and expected good value (or its alignment). Signed-off-by: Qu Wenruo --- fs/btrfs/tree-checker.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index 7bba195ecc8b..42e002f8a560 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -164,15 +164,21 @@ static int check_csum_item(struct btrfs_root *root, struct extent_buffer *leaf, u32 csumsize = btrfs_super_csum_size(root->fs_info->super_copy); if (key->objectid != BTRFS_EXTENT_CSUM_OBJECTID) { - CORRUPT("invalid objectid for csum item", leaf, root, slot); + generic_err(root, leaf, slot, + "invalid key objectid for csum item, have %llu expect %llu", + key->objectid, BTRFS_EXTENT_CSUM_OBJECTID); return -EUCLEAN; } if (!IS_ALIGNED(key->offset, sectorsize)) { - CORRUPT("unaligned key offset for csum item", leaf, root, slot); + generic_err(root, leaf, slot, + "unaligned key offset for csum item, have %llu should be aligned to %u", + key->offset, sectorsize); return -EUCLEAN; } if (!IS_ALIGNED(btrfs_item_size_nr(leaf, slot), csumsize)) { - CORRUPT("unaligned csum item size", leaf, root, slot); + generic_err(root, leaf, slot, + "unaligned item size for csum item, have %u should be aligned to %u", + btrfs_item_size_nr(leaf, slot), csumsize); return -EUCLEAN; } return 0;