From patchwork Tue Sep 11 17:57:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10596069 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 9863E14E5 for ; Tue, 11 Sep 2018 17:58:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84D5129B9D for ; Tue, 11 Sep 2018 17:58:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78F2129BA0; Tue, 11 Sep 2018 17:58:30 +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 24BE929B9D for ; Tue, 11 Sep 2018 17:58:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728260AbeIKW6y (ORCPT ); Tue, 11 Sep 2018 18:58:54 -0400 Received: from mail-qt0-f169.google.com ([209.85.216.169]:46043 "EHLO mail-qt0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728184AbeIKW6x (ORCPT ); Tue, 11 Sep 2018 18:58:53 -0400 Received: by mail-qt0-f169.google.com with SMTP id g44-v6so29156008qtb.12 for ; Tue, 11 Sep 2018 10:58:28 -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=yYx+AcpbxeLRdPqDImtMM4yf4Rg6f5T1yjgQiHsfUlY=; b=UPQOi3bhRdWp5pqPwNfDjP5+jRMgPD06R8ouazZNQIK6XCmqErnZbi1vpDYpDZvS4+ WwlABscHR6SmnCIDmlVuX0/3HtzMJYqfAq3XqsPGrDKUdL430VrQtOT+t3a32sg91sr8 bEN2y0shOeEgnT4ivZG2uSaNzBlHkpMjcWOzTQrOpJ7ZDJaVbZD46059mQvC2RPLFlVb 7ZMlYnBFxWCa5J8Tnu7QVAF/T8GpwGMjM7Snm+Lhtksed8kSGuZ1zOQ/6MeZPIQ9H/jX am+qiovDq2Tx3JangICTvpc3IQ4i1Yn4OKRnYtCj3zhef4cp7WpmRQ6ynvhINKI7VEq8 eCeQ== 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=yYx+AcpbxeLRdPqDImtMM4yf4Rg6f5T1yjgQiHsfUlY=; b=UNmCl/L23xl9BWSVVRp+a6z5jIO/eVtwMz4i6V4tAffpjMfqjJ2Nj11WhIQ9N8xiyE QjVX6mfCmDnHJRzxYE8ztRQ3UET4zVn/K4fA5cPx/whpRUsBRU9sEfBPg8SJF4Wn7Ksm DhvNI08PQIBZrWclMmMBKwyJYbdQ9H73kf/KD1zc1GrA0lzmB6YwjZVzEszAHUjN5MGw aH6ld9dT3nSwm/GoRZ86YDqQ56zEddhZ0O/8iPqSxx3FNBITmtAjtcLMsNYOiETw2niy 4ry6dFPE66eNSdvXNNgYY2HWjxXV15B5ZA6WZAi5pWb+/NAJSse9TdLh7IKndaihmxwP Uf+Q== X-Gm-Message-State: APzg51AEogy61CSSw3GOa1MX9oUy+HP6tFqXvv1R8vhDhJa4bEjkWarT WMTpWCRgP0+rhsj0HuhwedDXLQ== X-Google-Smtp-Source: ANB0VdZHGsF97bHHOxJvxO8rYK7wgd/4DKolpdyf/2FV/B32MBbUVfCROuEUbQde46m0dJyhxACIWg== X-Received: by 2002:ac8:3863:: with SMTP id r32-v6mr19937175qtb.69.1536688707635; Tue, 11 Sep 2018 10:58:27 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id h68-v6sm10382297qkc.97.2018.09.11.10.58.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Sep 2018 10:58:26 -0700 (PDT) From: Josef Bacik To: kernel-team@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH 09/36] btrfs: release metadata before running delayed refs Date: Tue, 11 Sep 2018 13:57:40 -0400 Message-Id: <20180911175807.26181-10-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 want to release the unused reservation we have since it refills the delayed refs reserve, which will make everything go smoother when running the delayed refs if we're short on our reservation. Reviewed-by: Omar Sandoval Reviewed-by: Liu Bo Reviewed-by: Nikolay Borisov Signed-off-by: Josef Bacik --- fs/btrfs/transaction.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 117e0c4a914a..a0f19ca0bd6c 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1922,6 +1922,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) return ret; } + btrfs_trans_release_metadata(trans); + trans->block_rsv = NULL; + /* make a pass through all the delayed refs we have so far * any runnings procs may add more while we are here */ @@ -1931,9 +1934,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) return ret; } - btrfs_trans_release_metadata(trans); - trans->block_rsv = NULL; - cur_trans = trans->transaction; /*