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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,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 6F6EFC072B1 for ; Thu, 30 May 2019 04:32:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 463EF256A0 for ; Thu, 30 May 2019 04:32:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559190740; bh=kWmMwuPTRb+1T90BSCkgw5VI7OQpnESmY40S8zU9mM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IkMmKe6zm6sjHGTMMfOl19+npLaMimI1YukIB9i6AuVCg3lHF9w9I5NS4QxPjThyn DRN2KOhCHwOH7wx/zmJzNBftnX+ZHi4brI2Y+6u/l8f7g+F3SYcGleF4+htnc1k6O3 Hr2AtWo5bL/2HJIBA0EQrSNwW6PrupWEgH+PnUr0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730423AbfE3EcM (ORCPT ); Thu, 30 May 2019 00:32:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:59634 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729545AbfE3DNl (ORCPT ); Wed, 29 May 2019 23:13:41 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (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 6E1E424561; Thu, 30 May 2019 03:13:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186020; bh=kWmMwuPTRb+1T90BSCkgw5VI7OQpnESmY40S8zU9mM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bJFnVMe20z2UcNXbQ4kCayKNgAYPRlPu83d61H+qoPck4rRVKDflwjrNMeQhMFbNM oVDWaTFvel+6V65LRRNimKApw2xQGpZkKpP+zs/RGJzWHZ6ek66oMMBL5HwFjNYjcA PsnAgIAVNrdGAZFz1smSTgz/q0bECVNkDnDfzQFE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Filipe Manana , Johannes Thumshirn , Qu Wenruo , David Sterba , Sasha Levin Subject: [PATCH 5.0 089/346] btrfs: Dont panic when we cant find a root key Date: Wed, 29 May 2019 20:02:42 -0700 Message-Id: <20190530030545.672744731@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.363386121@linuxfoundation.org> References: <20190530030540.363386121@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 7ac1e464c4d473b517bb784f30d40da1f842482e ] When we failed to find a root key in btrfs_update_root(), we just panic. That's definitely not cool, fix it by outputting an unique error message, aborting current transaction and return -EUCLEAN. This should not normally happen as the root has been used by the callers in some way. Reviewed-by: Filipe Manana Reviewed-by: Johannes Thumshirn Signed-off-by: Qu Wenruo Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/root-tree.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index fb205ebeca391..3228d3b3084a4 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -135,11 +135,14 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root if (ret < 0) goto out; - if (ret != 0) { - btrfs_print_leaf(path->nodes[0]); - btrfs_crit(fs_info, "unable to update root key %llu %u %llu", - key->objectid, key->type, key->offset); - BUG_ON(1); + if (ret > 0) { + btrfs_crit(fs_info, + "unable to find root key (%llu %u %llu) in tree %llu", + key->objectid, key->type, key->offset, + root->root_key.objectid); + ret = -EUCLEAN; + btrfs_abort_transaction(trans, ret); + goto out; } l = path->nodes[0]; -- 2.20.1