From patchwork Thu Sep 28 03:36:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9975243 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 D049C603F2 for ; Thu, 28 Sep 2017 03:36:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C140429411 for ; Thu, 28 Sep 2017 03:36:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B40182933B; Thu, 28 Sep 2017 03:36:29 +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.4 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM 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 3546C2933B for ; Thu, 28 Sep 2017 03:36:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752603AbdI1DgZ (ORCPT ); Wed, 27 Sep 2017 23:36:25 -0400 Received: from mout.gmx.net ([212.227.17.22]:61960 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752581AbdI1DgX (ORCPT ); Wed, 27 Sep 2017 23:36:23 -0400 Received: from localhost.localdomain ([45.32.39.184]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPSA (Nemesis) id 0LrZOj-1dCPhQ0CeD-013MJw; Thu, 28 Sep 2017 05:36:21 +0200 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH 4/5] btrfs: tree-checker: Enhance output for check_csum_item Date: Thu, 28 Sep 2017 12:36:09 +0900 Message-Id: <20170928033610.16882-5-quwenruo.btrfs@gmx.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170928033610.16882-1-quwenruo.btrfs@gmx.com> References: <20170928033610.16882-1-quwenruo.btrfs@gmx.com> X-Provags-ID: V03:K0:b6FsvHYS8rcE9dohiX7S5lM+6qNhO2kmyP5UZs3IxNIX0pEf6j6 3xGrOaUVHwGPr/lgBjd2mjS5ZxI0S+GE+W/ZbYGcR/pmL9yWI7fZr73XLC7BqP2p+YKd0E4 3EfGAL0q7kbol6lW+g5KgnS2mR0+g9qebyRYS3iMpT5P5oZgCg6RezYPAF9JlXFMz63zV1P i7b0ve/h1qVrJkEWCicpA== X-UI-Out-Filterresults: notjunk:1; V01:K0:mmebTAH1HLs=:KjhjJ7pyj0KCC5zj0r0UP3 es7FGAZ8X3IiPyI9uHajo57D3A4ToApBe+fMnHDpNZ+WSv5bRyh4388SWhevtPvYYa9EGZXHw ecK1UQIUWnvAfnx3bjLq0wEPaz/yEP44b9HynDkaDWIHO6jn/OYPNkbK9UXvFZjtG97W7yNza zs9iwh+rHA0a5Kl9yNwyiXgnlusZjaFKHQtFTtMnfYGHHLbUvLSMtDngmwJReH/kgT6PpIJM0 +GTLbMbSPkvt59UxPquaTc0tWjgA8j+wv+LngXaHyrIcHdHz0B5ZlsaCbVemoQhdT/LjGe9ka PpAXA8Uth2w//VFGMown+Sh+0Y9D2DpG4EwaNITvLbkQYIhndb6I4BYJtNRLiuh5DqHnxnPd2 sM9nEq/rxFbMVxuC/+FEYeeXlffjJo1EauaS7pBOHKImTohS7JAGZkGnsQIx2ylfOHaLGmZwM dkoEAYdqnNjHdn4El+tvfbsmpbaQEsx13WwLQ4+AZbDBN3MaLPiXkIuJs50k/5idit2cYCUW4 EacV9LONmimde2lln31CsyvQ3wPpPeJalZHzH4vjrgMxwd0+KaiFHQ1ButbV+FqQZDu24H91W WtcFzO+dSpq7bswYvwKhNLC7vJHo66p2MdEOwcHfQqM02AK+XpveWUq03BeTpss26X9GDAcyi 6ML3inkn9HmlCJpo3oPP/5cMsb1zojgDB7AOovsZQGCvj4ytBlXuSxvwyXBB+lQGGK2um27Oj +A2JmFDZWMcoMMMTqwVSke0H3yBw93FWhuLNs37ptf2wTY0igfTZ5iTbzstliv8rkilI9f4wS wFGDce1pgjhiqNAsBvLPkuZ57woDQ== 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 4f847955fdc6..52e9ab8c2a79 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -147,15 +147,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 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;