From patchwork Fri Sep 29 06:48:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9977131 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 77CB660365 for ; Fri, 29 Sep 2017 06:49:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B849297E1 for ; Fri, 29 Sep 2017 06:49:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6054E297E8; Fri, 29 Sep 2017 06:49: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=-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 38D2B297E1 for ; Fri, 29 Sep 2017 06:49:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752031AbdI2Gtg (ORCPT ); Fri, 29 Sep 2017 02:49:36 -0400 Received: from mout.gmx.net ([212.227.17.21]:65458 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752024AbdI2Gte (ORCPT ); Fri, 29 Sep 2017 02:49:34 -0400 Received: from localhost.localdomain ([104.207.157.105]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MdnN3-1dgzAd2d3N-00PdN8; Fri, 29 Sep 2017 08:48:59 +0200 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, nborisov@suse.com Subject: [PATCH v3 4/5] btrfs: tree-checker: Enhance output for check_csum_item Date: Fri, 29 Sep 2017 06:48:48 +0000 Message-Id: <20170929064849.15086-5-quwenruo.btrfs@gmx.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20170929064849.15086-1-quwenruo.btrfs@gmx.com> References: <20170929064849.15086-1-quwenruo.btrfs@gmx.com> X-Provags-ID: V03:K0:ar20aLiNbSigdVKY4wNNqK+WfdagCT5chlus8ybg3QAv1bQ/ibw jKIwiTHLcfb/FaJkfJkTF7MaPDWKSYFrhhPYAdHq2/vwlcqsFvBP+z5nv4ZcIBJ7C0coP5Z gPKFPAdrGoGULC7L3OiVhdMM3sRUYom+vH4iGnnYxr2KwEYBko5Js3n3h/Muuxp7CzdXjeN Txc9UtHUvcgKZl5Dz4bMg== X-UI-Out-Filterresults: notjunk:1; V01:K0:1D/RsIVXC5g=:DhmufeEmO892TY38bu61uW Ls/TbhA6YB0Yxa+2hHt6wxP40p0Iqlf3Pu88MBYq5Fo3EJz+dCBSZIp8z8jImlP+r2EZ754k/ fU88KzuNZqoFuLQd6lfiJhMcikgaKr8nw+q+yqdN6XxR7KyapYkz82UZXwrABSatrOT+pg3u5 SKt2YYE3UmLJRWOjry39FpWG+RI2Aj0QOaH1b/6UZ1Ae05OUByRrx7cGmKVHL/m8F34w0SCLt 0MaaMpZ/QBrGR4UIxT7I/iTNVEBExoJodcybq8hzt1lQ+i6TnhimkAa1LMlsoHBmMzbO3n/Il WlsTIu89i7dDEUFp7RxK78+baoUK0MOpjZnKQ8F4jNM7Mo2sdG2Fu8iLSXuyjiQyEsKJzqrbt nhJ7KpR8NJ+cO6yLkszCuXK9b7+22EUFR8jKJlBpGrRyw1cXMNS5ViuYusz500tNluXN+gwbB xQuV4RD1dgApIu3duSi5j1irqt2Jex+jux8yVtmluT/LCZHlT53HzI53FojoPARJciPs/e9sH c7hr7KBzKVCpLxwLtd2Juxff8UTpQthckQ8uJpM93wwdMAMxjzU1xXgVVhxFd9wfltHMrCp6M y81g3gTfwSkg5VhPlCQu/BImm4dMujO/dQtqwu0wM8ie8oagJyEkpyp5z5BFBIoda17nJeNT+ vI75OJg6GITZcHQALURfdSy5SHVTfSfMWrXOWrhijLTYsNlBR7ImD9L4Bei7/HZGke+NmLF/A 7Oh2xmcNZh7pao3lOMPUee1ImlALwRBOoxhC3vLyl2+Ap3B8jvjpoZnMmI7BssT664tgP9gCK LdfgMHwjYKXB+b4tu3Jc159nkSoCQ== 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 183ff7faa218..c0fd192f8140 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -163,15 +163,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;