From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8D84C388F7 for ; Mon, 9 Nov 2020 13:11:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B64D20867 for ; Mon, 9 Nov 2020 13:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927475; bh=77EQqyUDY5mGvJWX7TcU835iFbE5/Ve46rQti8tT4Ww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hGR7t1e0tcyHxBANtkh6ivIzN05eUGpflZ8+A5iP5JZckL93UMki3IIZk5J8YQfvz x0UHIChfYLdHVvAGkhA71mjf8GFe+x1bsUW88p3Baq/Z1jUbn5kysco2kvDi50Lr2V NqmH95guz6H31nQA90tjoH37Q92Lz5SmYady9V98= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732283AbgKINLO (ORCPT ); Mon, 9 Nov 2020 08:11:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:36660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732275AbgKINLK (ORCPT ); Mon, 9 Nov 2020 08:11:10 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8054920663; Mon, 9 Nov 2020 13:11:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927470; bh=77EQqyUDY5mGvJWX7TcU835iFbE5/Ve46rQti8tT4Ww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vSNzCY7To/0BPQM0aCgTkzHGUR5XLdqocZpT4wnjvgDUuAulLyUjitkuBEaNQxaQw +IOduxArst/LnXKTYO/aW6lCqwXiEqwdXPWWyQLJGe4gMpEfX1Qh25kP15kErDtEyx NhZ7MwYbjnZXbIJOoxWZyRD3hoPtlTVHNlY59po8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tyler Richmond , Marcos Paulo de Souza , Qu Wenruo , David Sterba , Ben Hutchings Subject: [PATCH 4.19 30/71] btrfs: tree-checker: fix the error message for transid error Date: Mon, 9 Nov 2020 13:55:24 +0100 Message-Id: <20201109125021.323872634@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125019.906191744@linuxfoundation.org> References: <20201109125019.906191744@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qu Wenruo commit f96d6960abbc52e26ad124e69e6815283d3e1674 upstream. The error message for inode transid is the same as for inode generation, which makes us unable to detect the real problem. Reported-by: Tyler Richmond Fixes: 496245cac57e ("btrfs: tree-checker: Verify inode item") CC: stable@vger.kernel.org # 5.4+ Reviewed-by: Marcos Paulo de Souza Signed-off-by: Qu Wenruo Signed-off-by: David Sterba [bwh: Backported to 4.19: adjust context] Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/tree-checker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -715,7 +715,7 @@ static int check_inode_item(struct btrfs /* Note for ROOT_TREE_DIR_ITEM, mkfs could set its transid 0 */ if (btrfs_inode_transid(leaf, iitem) > super_gen + 1) { inode_item_err(fs_info, leaf, slot, - "invalid inode generation: has %llu expect [0, %llu]", + "invalid inode transid: has %llu expect [0, %llu]", btrfs_inode_transid(leaf, iitem), super_gen + 1); return -EUCLEAN; }