From patchwork Thu Aug 30 17:42:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10582481 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 9DA1B1805 for ; Thu, 30 Aug 2018 17:43:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8454328676 for ; Thu, 30 Aug 2018 17:43:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7839D2C363; Thu, 30 Aug 2018 17:43:23 +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 0E40228676 for ; Thu, 30 Aug 2018 17:43:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727727AbeH3Vqg (ORCPT ); Thu, 30 Aug 2018 17:46:36 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:44485 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726878AbeH3Vqg (ORCPT ); Thu, 30 Aug 2018 17:46:36 -0400 Received: by mail-qt0-f196.google.com with SMTP id k38-v6so11285517qtk.11 for ; Thu, 30 Aug 2018 10:43:21 -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=fO7/zB41YFxTFsoapdxATBT+tWvYEisHvJIXvVumirM=; b=hSGP35YZtOFg0PtlUiWrlox2XP4Q02vfyQJiskXyEeMT0Get5nSdPQpsJHOjSCEGSV PAdNUqr7k9gHWAJpBb/G23db1PYrtsUYaZwS45rKaxdK91OQnPYukrbCnBu3U5JPzvZb rSB3YyF1wU2XFHBBkN+BgoaFN29dnDEmQQq+TiRdLatmLEO8ADOaMA2nAwKMD+uLWHcH 1Dp+tBAGGjCJNDNVt3T9/LtiM/beh/LKFluygcO1b2Fr7QLlwo6CuRLMeJIDDfCv++lm xsalhkrWy/81Q+6yWs9vkYR+TiHo7ZXuNFaYp7epePxR0LSGz5gHqtp0gc0ncoNDYsJp KJpQ== 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=fO7/zB41YFxTFsoapdxATBT+tWvYEisHvJIXvVumirM=; b=fzwE9Bq06u7kchkFCMrfVa+0fZDDq4MlQjnOzON0bqA0QDdklifnwCnz6w5+PtY/Zy E9oOfyRHAN4IR/Zu41BaIavQvKJH6W4JMrg6OdPCVhzi1RiQx/jXMjF2Ln63weGqGvHP zYbAHfDujVJfNpZ4GLJpuMxODdv4hT7/3r0FRdnrX0q8Da/HYtPx4mL8JwkTxUvIO/pw vbRQmUF+ZcWZJN81+PKW+TWQQlzDrloipIK1pCMWIC9WR040gC4dPP/9r2caK0MCRcvJ I4Yki1dcl2MLKFmvvZAwcgNwnQZIoiAhNfmf7aOpPRq635zZlG73FuugAx5r8f5N9gda rnrQ== X-Gm-Message-State: APzg51BVhURqrjVmbLAQR79J1HFjfDCnmjDcvgKWMjE/kHhDA4oRzjsJ 3KxqVvG+TJ9ABsjiFH+CrvkIhWKPPoeyBg== X-Google-Smtp-Source: ANB0Vdb4BJUbyOIYFRiHrDQw2EZ6e5vretxjwj2n/5eWnVPFcnsvQFMd5vc1sNZNPY4rgEiofgmEWQ== X-Received: by 2002:a37:ad0a:: with SMTP id f10-v6mr12402653qkm.186.1535651000609; Thu, 30 Aug 2018 10:43:20 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id v10-v6sm4945076qtv.77.2018.08.30.10.43.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Aug 2018 10:43:19 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org Subject: [PATCH 29/35] btrfs: just delete pending bgs if we are aborted Date: Thu, 30 Aug 2018 13:42:19 -0400 Message-Id: <20180830174225.2200-30-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180830174225.2200-1-josef@toxicpanda.com> References: <20180830174225.2200-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. Signed-off-by: Josef Bacik Reviewed-by: Omar Sandoval --- fs/btrfs/extent-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 90f267f4dd0f..132a1157982c 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -10333,7 +10333,7 @@ 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 = trans->aborted; bool can_flush_pending_bgs = trans->can_flush_pending_bgs; trans->can_flush_pending_bgs = false;