From patchwork Tue Sep 11 17:58:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10596111 Return-Path: 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 6561E14E5 for ; Tue, 11 Sep 2018 17:59:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F9AE29B9F for ; Tue, 11 Sep 2018 17:59:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4430129BA1; Tue, 11 Sep 2018 17:59:08 +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 E85EF29B9F for ; Tue, 11 Sep 2018 17:59:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728356AbeIKW7c (ORCPT ); Tue, 11 Sep 2018 18:59:32 -0400 Received: from mail-qk1-f181.google.com ([209.85.222.181]:40182 "EHLO mail-qk1-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728113AbeIKW7b (ORCPT ); Tue, 11 Sep 2018 18:59:31 -0400 Received: by mail-qk1-f181.google.com with SMTP id c126-v6so17335233qkd.7 for ; Tue, 11 Sep 2018 10:59:06 -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=Pfr8PJ6lBohDtfLvIty4m8qWDAx4WUj8q5IxsDN4oAs=; b=rUZwZDGQYpP9j9M7hldy2oGnIgsiVWYAqhaTFrZDzqkMmkLMjg2sqx/mOce7Eb5oVv FQ7Ut/jMZ1ek2/FjjYmsoNiYHSX9/lp7U8S+CCnGNOzZGoqu6qF5G1LOUogmOJs0vsMV jno5m4DzGnmvy+WClAM5z6NDx1tHFHgu6qAPo/bymXypRP5n6qBXkjq0wywVEkvJ7Iaf JhwRu0IgE/g50T+n3m7wl1tzMfFAJxL2HXoPg922vmmbodYjNg7rQ13Gnd0PdSij1k+7 XluViN0womPh+ABSTK1DLl0JOUQMQLxX7pLaxBjAy47eNut7+goJq70YjpheYYJfiUHf 3WDg== 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=Pfr8PJ6lBohDtfLvIty4m8qWDAx4WUj8q5IxsDN4oAs=; b=aBu4PAOV2Dhtu4TSyhgvLHU1JcPoeNWQUEqghKeJUwur4eCJBHtEpWFwTs3GegSbrd 6gB10iqfPJsbUtgCL6k7lRJa1KbsLXIJxLecL7ZkdockAFWlS1MQh5CxAlwNioSU31bo gpKP+fN8UZiJwp19Su45Zg79nu+Xr+lrIpuWrh9ZevyJCZ84/NfeLMkRivP+xvxpTC9E GwtcgYENbxjiBT/s2/Rx1aL6OSmIWGkL1xXR1jV/ImwLZPYOUrgplcCHy23XcGL6umm5 7z+v0FuaOKI+lvVMwNbfYaDoIt+lH5x/QtFFui2j2N7v+q8uzV7/YoEND6T6hmxurLrH KyNQ== X-Gm-Message-State: APzg51CsrqWyUX+TyHHxlowWv3RzhxiNexm0U1/86LYII0LBsZGwzS+9 3bQ6HdlcWQzwYSqe1og+PkBy/w== X-Google-Smtp-Source: ANB0VdbULJpcLG16kX+37YycsydqQittRS4luxqaV9VAwrqfew+ZvOeeiW5spqoRXvhnEPJuJ/zVvw== X-Received: by 2002:a37:98c3:: with SMTP id a186-v6mr20136867qke.128.1536688745632; Tue, 11 Sep 2018 10:59:05 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id n24-v6sm16119009qtf.0.2018.09.11.10.59.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Sep 2018 10:59:04 -0700 (PDT) From: Josef Bacik To: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 30/36] btrfs: just delete pending bgs if we are aborted Date: Tue, 11 Sep 2018 13:58:01 -0400 Message-Id: <20180911175807.26181-31-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: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We still need to do all of the accounting cleanup for pending block groups if we abort. So set the ret to trans->aborted so if we aborted the cleanup happens and everybody is happy. Reviewed-by: Omar Sandoval Signed-off-by: Josef Bacik --- fs/btrfs/extent-tree.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 20fed467468e..47690589d89b 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -10358,9 +10358,15 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans) struct btrfs_root *extent_root = fs_info->extent_root; struct btrfs_block_group_item item; struct btrfs_key key; - int ret = 0; + int ret; bool can_flush_pending_bgs = trans->can_flush_pending_bgs; + /* + * If we aborted the transaction with pending bg's we need to just + * cleanup the list and carry on. + */ + ret = trans->aborted; + trans->can_flush_pending_bgs = false; while (!list_empty(&trans->new_bgs)) { block_group = list_first_entry(&trans->new_bgs,