From patchwork Thu Aug 30 17:41:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10582433 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 C1AC817DE for ; Thu, 30 Aug 2018 17:42:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF3882C34B for ; Thu, 30 Aug 2018 17:42:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3A942C35F; Thu, 30 Aug 2018 17:42:42 +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 30A6F2C34B for ; Thu, 30 Aug 2018 17:42:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727451AbeH3Vp4 (ORCPT ); Thu, 30 Aug 2018 17:45:56 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:45925 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726727AbeH3Vpz (ORCPT ); Thu, 30 Aug 2018 17:45:55 -0400 Received: by mail-qk1-f194.google.com with SMTP id z125-v6so22674qkb.12 for ; Thu, 30 Aug 2018 10:42:40 -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=QID6sbzQnZ5mudS/me9bf30Y9AWtvUfPLtB787pk2fc=; b=ZFIM1UOELFtl6Kbcq3DBdqkwYGKhWgCmT+8JVi/HYu5IPNW7jixMquFdd03+dRaRrK Aox6m78yziw/Os60W9OMkMLnZki4OaCA1OSkDowV8uKEvxWUfOSKwBBUvPEFzGtB5XD1 Efkn5kbkhRst+RQPg9UFl/XJiy2woJMePpgNB10BjBZJFmVeI0BVXsP0Fw8C8ryuFMcz N9N103UIutiZPTFiKNFkW+trI079Aqm83lQB9xuNJY7grvnc2REswaolAObTEKWfsvNb KnjSR1Y5/tebVzFJinwkAr8KSUHFZVD3EQXkpA4NiSArvYFtLDAqUWFCZdCRMg+gaehy gGcw== 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=QID6sbzQnZ5mudS/me9bf30Y9AWtvUfPLtB787pk2fc=; b=TgA67YSoWFWucYUG6vPl5wdQYA5MeVdmsH20LPTNakgtZww8U6SdB2LhOlqOMy0Z6M AUr+xO3EjnpA+LNJIjT43pHZGyPBd6+AfiN93pM2tqotClYaiWSMeUgi6F/QSiHW7cR0 GuH6HWKvenq4fCami3kzd+6MjJ28EB0w9UB7SPWr/d3vDTjgu6+JXPaUYbkxOTjQugk+ jHfxm4PFDABIhFVUO/gZQYmi6uzo/dXav2AHQGTkf1SuPjUJUX4AfMglTN6CgG9o6N6j zR7AFZJoIEFuwwLNjpMcgcSMYlGSgEJlyr+pAjuzDk4olWZ5uj6arXpsR5DvgAHy3NYL kU8g== X-Gm-Message-State: APzg51DVY0e2kVDPnafQwgk+mrz5oVxJD0OCWqS7awufcRrV38EvckuF GO6Mk0+0G+aitXPUAAInpegInrNeUfp05A== X-Google-Smtp-Source: ANB0VdaylBRIygUYGhcFcbMKihlZIijAlABDjZX6eLOw4K6TYvzj+ena0HjaTI4EmpiaaDivxdq5kQ== X-Received: by 2002:a37:283:: with SMTP id v3-v6mr12603028qkg.200.1535650959470; Thu, 30 Aug 2018 10:42:39 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id m12-v6sm4390881qkl.54.2018.08.30.10.42.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Aug 2018 10:42:38 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org Subject: [PATCH 06/35] btrfs: check if free bgs for commit Date: Thu, 30 Aug 2018 13:41:56 -0400 Message-Id: <20180830174225.2200-7-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 may_commit_transaction will skip committing the transaction if we don't have enough pinned space or if we're trying to find space for a SYSTEM chunk. However if we have pending free block groups in this transaction we still want to commit as we may be able to allocate a chunk to make our reservation. So instead of just returning ENOSPC, check if we have free block groups pending, and if so commit the transaction to allow us to use that free space. Signed-off-by: Josef Bacik --- fs/btrfs/extent-tree.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 6e7f350754d2..80615a579b18 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -4804,6 +4804,7 @@ static int may_commit_transaction(struct btrfs_fs_info *fs_info, struct btrfs_trans_handle *trans; u64 bytes; u64 reclaim_bytes = 0; + bool do_commit = true; trans = (struct btrfs_trans_handle *)current->journal_info; if (trans) @@ -4832,8 +4833,10 @@ static int may_commit_transaction(struct btrfs_fs_info *fs_info, * See if there is some space in the delayed insertion reservation for * this reservation. */ - if (space_info != delayed_rsv->space_info) - return -ENOSPC; + if (space_info != delayed_rsv->space_info) { + do_commit = false; + goto commit; + } spin_lock(&delayed_rsv->lock); reclaim_bytes += delayed_rsv->reserved; @@ -4848,15 +4851,18 @@ static int may_commit_transaction(struct btrfs_fs_info *fs_info, if (__percpu_counter_compare(&space_info->total_bytes_pinned, bytes, - BTRFS_TOTAL_BYTES_PINNED_BATCH) < 0) { - return -ENOSPC; - } - + BTRFS_TOTAL_BYTES_PINNED_BATCH) < 0) + do_commit = false; commit: trans = btrfs_join_transaction(fs_info->extent_root); if (IS_ERR(trans)) return -ENOSPC; + if (!do_commit && + !test_bit(BTRFS_TRANS_HAVE_FREE_BGS, &trans->transaction->flags)) { + btrfs_end_transaction(trans); + return -ENOSPC; + } return btrfs_commit_transaction(trans); }