Message ID | 3196793231c00ea35b74770f034c3ee70df1973c.1607019557.git.josef@toxicpanda.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-btrfs-owner@kernel.org> 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 CE5C8C4167B for <linux-btrfs@archiver.kernel.org>; Thu, 3 Dec 2020 18:24:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7670C208BA for <linux-btrfs@archiver.kernel.org>; Thu, 3 Dec 2020 18:24:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387918AbgLCSY3 (ORCPT <rfc822;linux-btrfs@archiver.kernel.org>); Thu, 3 Dec 2020 13:24:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728120AbgLCSY3 (ORCPT <rfc822;linux-btrfs@vger.kernel.org>); Thu, 3 Dec 2020 13:24:29 -0500 Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 508E6C061A56 for <linux-btrfs@vger.kernel.org>; Thu, 3 Dec 2020 10:23:15 -0800 (PST) Received: by mail-qt1-x843.google.com with SMTP id z3so2040373qtw.9 for <linux-btrfs@vger.kernel.org>; Thu, 03 Dec 2020 10:23:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U/ZltL4YxiXvMtQIs4ID4XcnLkWVuTx7SSXbu0ywjvI=; b=kHc6k7Apvca2bugkO+JpvgxF9dYy2n8MEtUL5fzUG4PETlxV3vUSKEZ6os+pLfvl7S McAzCPQ+TKaMeuwNURSy1HjIjuzWRZEGKKnU1H8jsHitXzkWleQPyOXyqqFksEfoUUVW ptvAyyvzTN+5fiiLNuK746HPSuyuuAlYh9rrqhFhh3s9ckQEKJaBOTm4w4+/ql/VrxET x84wuEJSXBYmQJc21Q/RlprIOHdSW+0HE+Whrmd2Sa9kZe/WOXiTTsqxbipEjePA5bqX PYY2VEswaokYXhFNuuKVRN275Q1yneYD4AjyFqoqaME86XOSWE+gFYR/2JxReQsXNnGE ldYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U/ZltL4YxiXvMtQIs4ID4XcnLkWVuTx7SSXbu0ywjvI=; b=lB363ElzoyFr+CWV05WoE53avre3ks1LNqmllz7aWHtQi9VvEtTFYH3hi1lh3edLfR 4XA4Y2gkSNHgJCPx/9Kg+PtH6XJ54bhTaNzL35DWt+2a5SDGQJZYCVkxYchWrV9QvX9R cklFi2zGiB1kZHla6FjPeYG9/vBvHceJ4Y5VoGTFkvzUsd6xKrXi7PA3f43j02rzyz8d /vjrbXiMA53CL2yJHkt2VER9eSdwM374vMBCxBV8cH02QZuqDmcpUOK9g3W2doKKmK8N K4RIzCf/ntFV233wKcwXEQHv8a3N9a4m4YyALVU9EwzhOgDFQ6Z9B2Uxpzd9rF9IAxSJ xJ/Q== X-Gm-Message-State: AOAM533F0yKuHKz4N0db0R4h3go0M7VaBNNy97peKP9pAplvbwSY/pT+ iSu7S1SlkA56YCDqz4vmEiS7FMriwDo/i9cW X-Google-Smtp-Source: ABdhPJzkgQSf0gqYFDbVuME71Qr/paeYoDE5viWSHRkinCrMncRRv+wwBhwkhOQZTR3iTTFS8H9nzA== X-Received: by 2002:aed:32c7:: with SMTP id z65mr4589728qtd.266.1607019793243; Thu, 03 Dec 2020 10:23:13 -0800 (PST) Received: from localhost (cpe-174-109-172-136.nc.res.rr.com. [174.109.172.136]) by smtp.gmail.com with ESMTPSA id z20sm2144376qtb.31.2020.12.03.10.23.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Dec 2020 10:23:12 -0800 (PST) From: Josef Bacik <josef@toxicpanda.com> To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Cc: Qu Wenruo <wqu@suse.com> Subject: [PATCH v4 07/53] btrfs: do not cleanup upper nodes in btrfs_backref_cleanup_node Date: Thu, 3 Dec 2020 13:22:13 -0500 Message-Id: <3196793231c00ea35b74770f034c3ee70df1973c.1607019557.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <cover.1607019557.git.josef@toxicpanda.com> References: <cover.1607019557.git.josef@toxicpanda.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <linux-btrfs.vger.kernel.org> X-Mailing-List: linux-btrfs@vger.kernel.org |
Series |
Cleanup error handling in relocation
|
expand
|
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 02d7d7b2563b..56f7c840031e 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -2541,13 +2541,6 @@ void btrfs_backref_cleanup_node(struct btrfs_backref_cache *cache, list_del(&edge->list[UPPER]); btrfs_backref_free_edge(cache, edge); - if (RB_EMPTY_NODE(&upper->rb_node)) { - BUG_ON(!list_empty(&node->upper)); - btrfs_backref_drop_node(cache, node); - node = upper; - node->lowest = 1; - continue; - } /* * Add the node to leaf node list if no other child block * cached.