Message ID | 20180928111821.24376-32-josef@toxicpanda.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-btrfs-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3DED415A7 for <patchwork-linux-btrfs@patchwork.kernel.org>; Fri, 28 Sep 2018 11:19:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 350242B061 for <patchwork-linux-btrfs@patchwork.kernel.org>; Fri, 28 Sep 2018 11:19:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 298B22B0CF; Fri, 28 Sep 2018 11:19:25 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 CE3FF2B061 for <patchwork-linux-btrfs@patchwork.kernel.org>; Fri, 28 Sep 2018 11:19:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729527AbeI1Rmk (ORCPT <rfc822;patchwork-linux-btrfs@patchwork.kernel.org>); Fri, 28 Sep 2018 13:42:40 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:44809 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729513AbeI1Rmk (ORCPT <rfc822;linux-btrfs@vger.kernel.org>); Fri, 28 Sep 2018 13:42:40 -0400 Received: by mail-qt1-f195.google.com with SMTP id c56-v6so1241450qtd.11 for <linux-btrfs@vger.kernel.org>; Fri, 28 Sep 2018 04:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=esyabqCBu+9iDj6gymgoZZfIo7W+xlWCseOBiKeoQzQ=; b=Oese1BH95QAWz361InMKFeP7xWkTBwxNBbYSicJAaQ8ykWpj8wdyXebyoQYNsRtqwd P7S/NIrBjLSYPh18EQShviSJ3y4kCRGqUTgTS/qq6vb41ZZXxmwoOjdj7b0cniGYzUVQ eJthzNje4j9Z+gRmKUc5fbgklzixkD6E3qM7r2cK78aCctON7+wGl/53jpSVLlOQGi2E FYx/pBZUz/W67TRSK7b3mQshz1xqXl732sGWH5WRl5P1siv2iEih5UeQCWJEEZ5WY/vC v7f8rdAaDLurlb6KPOp1FX7TzNku8Zqk6Rr6nx4uHecFq9Lj3MDMxHyrleLBSm76HPmA q6rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=esyabqCBu+9iDj6gymgoZZfIo7W+xlWCseOBiKeoQzQ=; b=c18p8F7PK3mIf0ysOqkadYKjMaBGZwjy99lBncJCaAJnYvO4X/YrRudTHGU7NRklI6 jVfJIyNHIXxKSEsi7CzIU2BVIizQpoY5KIOwYlGNjNsBnQ08r4ebvhhNJPbtjkBccmxX 1mIPzKMEbUZSg4MlY+GItYirEoIdW1JuX1JqBwVEnWD1VRtRIefRcAvgd1CSMpu+Js+l +dUM50bIE3jTkxVFzIhhND/2LD7Bwz/KnnUsvAvrRzPvns1AK4TPmwP7ZTZ5lAfWpRpp Qs/njrI6F6cpCFhQ0kDjy4BouFpM7YZoLHgkRrskf9/G/+t5YcYa8V1QBGXZ3u4SqwMU 5dTg== X-Gm-Message-State: ABuFfohSfaQcoBrt11FDJSn6IMBmyyVDcCchnkcjb2SObxg1xjia2xPV KuIQ9zxKKNz8kFgf2XuGFJocHg== X-Google-Smtp-Source: ACcGV62o+RfiMAWSwQ6LXQGAIF8UW7BLjXCJ0CjodJkoiHYZjdTkEcTr8sqtPam6QeVglyhn7KPcRg== X-Received: by 2002:a0c:83c4:: with SMTP id k62-v6mr11502062qva.88.1538133562704; Fri, 28 Sep 2018 04:19:22 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id b9-v6sm2416140qtp.79.2018.09.28.04.19.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Sep 2018 04:19:21 -0700 (PDT) From: Josef Bacik <josef@toxicpanda.com> To: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 31/42] btrfs: cleanup pending bgs on transaction abort Date: Fri, 28 Sep 2018 07:18:10 -0400 Message-Id: <20180928111821.24376-32-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180928111821.24376-1-josef@toxicpanda.com> References: <20180928111821.24376-1-josef@toxicpanda.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: <linux-btrfs.vger.kernel.org> X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
My current patch queue
|
expand
|
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 46ca775a709e..9168efaca37e 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -2280,6 +2280,10 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) btrfs_scrub_continue(fs_info); cleanup_transaction: btrfs_trans_release_metadata(trans); + /* This cleans up the pending block groups list properly. */ + if (!trans->aborted) + trans->aborted = ret; + btrfs_create_pending_block_groups(trans); btrfs_trans_release_chunk_metadata(trans); trans->block_rsv = NULL; btrfs_warn(fs_info, "Skipping commit of aborted transaction.");