From patchwork Tue Sep 8 15:24:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 309905 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 71DD2C2BC11 for ; Tue, 8 Sep 2020 19:29:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E6C32145D for ; Tue, 8 Sep 2020 19:29:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599593365; bh=MekHGvyuxks7mRtjZXsW9zksaxfXWlJYGDwuV95H3xE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xbuc1XugPVB9EEcNoYCPuKP0AQI8VqMfJ7xvFGmMRunbkK8KrAyhJG2vWhHOhcl/R vdJrerCHtL+J2yiEhaJfaJBdqJH4cfRA/VonYFAiRcj9Doo9/G6aHJGwa/lSjtKHnA Umnfv18SaXyHdc+CkZbczDbDwM9Nsxl0RS6zbH/4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731248AbgIHT26 (ORCPT ); Tue, 8 Sep 2020 15:28:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:47746 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731054AbgIHQAE (ORCPT ); Tue, 8 Sep 2020 12:00:04 -0400 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 5152024673; Tue, 8 Sep 2020 15:39:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579567; bh=MekHGvyuxks7mRtjZXsW9zksaxfXWlJYGDwuV95H3xE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Az1TgRO9oEYJTNKB1Ij0p5Ni3JrMYe7W8Ar9hy+S9hB2ho1DZmlGSz335UewkUgt6 niUa9IXu9rkL2LH1oGrUWxMtyGdDtdvuBGt4I+xnRjp0d5hn20NMSFHCkM7wZUIHi6 9Tu6+IrVMFP3DdLdZGbcJpJ0V6sLBhxn3ziYQ9hM= 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 Subject: [PATCH 5.8 131/186] btrfs: tree-checker: fix the error message for transid error Date: Tue, 8 Sep 2020 17:24:33 +0200 Message-Id: <20200908152247.989688426@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152241.646390211@linuxfoundation.org> References: <20200908152241.646390211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 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 @@ -984,7 +984,7 @@ static int check_inode_item(struct exten /* Note for ROOT_TREE_DIR_ITEM, mkfs could set its transid 0 */ if (btrfs_inode_transid(leaf, iitem) > super_gen + 1) { inode_item_err(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; }