Message ID | 20180911175807.26181-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 12A1414BD for <patchwork-linux-btrfs@patchwork.kernel.org>; Tue, 11 Sep 2018 17:59:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3A9A29B9F for <patchwork-linux-btrfs@patchwork.kernel.org>; Tue, 11 Sep 2018 17:59:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E878529BA1; Tue, 11 Sep 2018 17:59:09 +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 9A4AF29B9F for <patchwork-linux-btrfs@patchwork.kernel.org>; Tue, 11 Sep 2018 17:59:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728360AbeIKW7d (ORCPT <rfc822;patchwork-linux-btrfs@patchwork.kernel.org>); Tue, 11 Sep 2018 18:59:33 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:40946 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728113AbeIKW7d (ORCPT <rfc822;linux-btrfs@vger.kernel.org>); Tue, 11 Sep 2018 18:59:33 -0400 Received: by mail-qk1-f195.google.com with SMTP id c126-v6so17335287qkd.7 for <linux-btrfs@vger.kernel.org>; Tue, 11 Sep 2018 10:59:07 -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=C30ovoey3bX/StrmbQl4PZgfiICzZlrxjdnLxDqqYGjwrEu9jduhnzzWvTdSUaThB3 nHrW0eLWr/j78DFYSE1Vhh0kR/DYUHzF2MB0ky12tqZ1EBSEQDeftKtjAtASBRsso9HV haO+qVz74mR+P1voo8df0EYej9JEF/Paw0ueg33AUlv3AW4pEifngAScBJxnIKs9NmbB DUtRwvluRhDVq+aUXmCRgKwvcHITod3wQXN/dcKjW/6RRf89X6bI72QXBhxCPvJyzliQ Es7rnjVu9dhkizM/YdAmK88EA1hOD2TghQ5i7sM8UwT3r6SrnK7BAoOlGWyAeH73kBu+ CG9A== 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=NAMHnepschrCCE0jpkWPl1pD+hW/tXxlLzr6M8hAo0qino2WH8Nv3wlebd2bGi6o6+ TeewvCOCA3i+ZQDGlq/Zv0navmpSWg4WVf96JMxO6KXTY1QY/OlDV4WoMhwRKd/rU39w 5SM8fKlwaZOeXFOGYDbIhDiQkuZVNM34awBlLv9Jl2Ag9C2aK1fWoizKCQU2KdmUQNgf TVceqToNtUJyrhvq31OU42bH2zTkGQ5Z4mO+OaroAAa9dbbgIZHtm9bv8w3XkVR5y0xi HuYkFo2CDhxa0rNDnTIsydwRGmLjdH0mCwrI1R5Mo/Cd2tZGRZG63SypuAoM6++uk+n/ 6Fgw== X-Gm-Message-State: APzg51Dl99Ggk6Xd6a9jgyPMUfjOAQeGn3Bu2buLfuhAhHRTzcng/g1y JCxH2BwIvUtw3zKY9RhohUB5N+hzQkm+dg== X-Google-Smtp-Source: ANB0VdZwQkeGaL10LXpxxd9rxOO4M+YwdNuEyv2FcCL2MqAeWERcVBG5zOXOVr/5glSajkiDi6oREg== X-Received: by 2002:a37:6458:: with SMTP id y85-v6mr19421330qkb.59.1536688747480; Tue, 11 Sep 2018 10:59:07 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id w30-v6sm11289204qtc.51.2018.09.11.10.59.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Sep 2018 10:59:06 -0700 (PDT) From: Josef Bacik <josef@toxicpanda.com> To: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 31/36] btrfs: cleanup pending bgs on transaction abort Date: Tue, 11 Sep 2018 13:58:02 -0400 Message-Id: <20180911175807.26181-32-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180911175807.26181-1-josef@toxicpanda.com> References: <20180911175807.26181-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.");