From patchwork Thu Jul 19 14:49:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10534665 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8527A600D0 for ; Thu, 19 Jul 2018 14:50:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A6EC2936B for ; Thu, 19 Jul 2018 14:50:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EB1B29CBB; Thu, 19 Jul 2018 14:50:12 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 E75D72936B for ; Thu, 19 Jul 2018 14:50:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730899AbeGSPdl (ORCPT ); Thu, 19 Jul 2018 11:33:41 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:36932 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727584AbeGSPdk (ORCPT ); Thu, 19 Jul 2018 11:33:40 -0400 Received: by mail-qt0-f193.google.com with SMTP id n6-v6so2858238qtl.4 for ; Thu, 19 Jul 2018 07:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=qDASD4LwgMz1flqGuD00eOqFK/7Jb6lX8DG/NoVchM0=; b=MtndK+ldjgkuGH5QM8LpGFB3dWjjrNnpCZ2xNi7QkeUuBTZLvqw+o73vvB9r6drLSh OCDV8bkSO264LbgxaVmguyJ6LHL05eOWn3YqTw4k1dbULIM3xqGKUUas5xexy9IxzM6Q Qv8QR8rx1fdB5jr0lCO5vnE/7hxIf6r2fM8rz3ZzBjbPdN1rHgobSDshR608lUznunLP s5ZU4oG8fqAZ4Bhb8Jw8YEX/sEYnylkxjGIY4Kj0cxB7UIPTgotAAd6/a+zNa+XqeXTH N9PDj7FdnUyIEIYu1pro4gjlCRKDPQziC1Iahpmq3kgg5HUZE0C+fHZX+3GrU2NjsiAK rf1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qDASD4LwgMz1flqGuD00eOqFK/7Jb6lX8DG/NoVchM0=; b=WUU9dbYTuSO0tu0axPde2rRmmX4829p2vK768M3rSJOUZ/hjG8aGY+YNnmbXJWidMs Yj7Nv7Rh1IVnCC7QYVndyaG8dLt40cvuPPYp50MENz6TjnyhmavV+5/QrslivW49sULL 9fUVcdr44A9c1+Xhcjb5agAhiaWLZ7cAOnHx0QYAVwKoH65YUq08OZLJ7vmC1iA6NQTO EeRBy7KyCDJ0lTAlol4AS65F5qHT2j7qFC607RRkMS+T7Uf0jb2E5A+fadU1A+2W8rbR 3nynFMNeXAWemCz1Oj6YpBzqfrrbNXEfZxCRWA8t53Gs/wKE9m4Jvwv6W8JQeQcWlkW0 2wUQ== X-Gm-Message-State: AOUpUlGk0x8Td1Mw07EcUp6nJe9xe7Q13kXVcc2/qofw9TRIKH+fyOIn 7sJNgkknWokYwGOGsoMYXnrQaWoA4Zc= X-Google-Smtp-Source: AAOMgpcsIi88q+9+l4zCR2nOdMXluyjB9KDSO7ievZM7VmLB3jjASURQSnIEYiZTLDaT8ZyKUAysow== X-Received: by 2002:ac8:33c2:: with SMTP id d2-v6mr9764789qtb.323.1532011808745; Thu, 19 Jul 2018 07:50:08 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id e33-v6sm5105433qte.54.2018.07.19.07.50.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jul 2018 07:50:08 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Cc: Josef Bacik Subject: [PATCH 01/22] btrfs: add btrfs_delete_ref_head helper Date: Thu, 19 Jul 2018 10:49:45 -0400 Message-Id: <20180719145006.17532-1-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 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 From: Josef Bacik We do this dance in cleanup_ref_head and check_ref_cleanup, unify it into a helper and cleanup the calling functions. Signed-off-by: Josef Bacik --- fs/btrfs/delayed-ref.c | 14 ++++++++++++++ fs/btrfs/delayed-ref.h | 3 ++- fs/btrfs/extent-tree.c | 24 ++++-------------------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index 03dec673d12a..e1b322d651dd 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -393,6 +393,20 @@ btrfs_select_ref_head(struct btrfs_trans_handle *trans) return head; } +void btrfs_delete_ref_head(struct btrfs_delayed_ref_root *delayed_refs, + struct btrfs_delayed_ref_head *head) +{ + lockdep_assert_held(&delayed_refs->lock); + lockdep_assert_held(&head->lock); + + rb_erase(&head->href_node, &delayed_refs->href_root); + RB_CLEAR_NODE(&head->href_node); + atomic_dec(&delayed_refs->num_entries); + delayed_refs->num_heads--; + if (head->processing == 0) + delayed_refs->num_heads_ready--; +} + /* * Helper to insert the ref_node to the tail or merge with tail. * diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h index ea1aecb6a50d..36318182e4ec 100644 --- a/fs/btrfs/delayed-ref.h +++ b/fs/btrfs/delayed-ref.h @@ -263,7 +263,8 @@ static inline void btrfs_delayed_ref_unlock(struct btrfs_delayed_ref_head *head) { mutex_unlock(&head->mutex); } - +void btrfs_delete_ref_head(struct btrfs_delayed_ref_root *delayed_refs, + struct btrfs_delayed_ref_head *head); struct btrfs_delayed_ref_head * btrfs_select_ref_head(struct btrfs_trans_handle *trans); diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 3d9fe58c0080..ccaccd78534e 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -2577,12 +2577,9 @@ static int cleanup_ref_head(struct btrfs_trans_handle *trans, spin_unlock(&delayed_refs->lock); return 1; } - delayed_refs->num_heads--; - rb_erase(&head->href_node, &delayed_refs->href_root); - RB_CLEAR_NODE(&head->href_node); - spin_unlock(&head->lock); + btrfs_delete_ref_head(delayed_refs, head); spin_unlock(&delayed_refs->lock); - atomic_dec(&delayed_refs->num_entries); + spin_unlock(&head->lock); trace_run_delayed_ref_head(fs_info, head, 0); @@ -7122,22 +7119,9 @@ static noinline int check_ref_cleanup(struct btrfs_trans_handle *trans, if (!mutex_trylock(&head->mutex)) goto out; - /* - * at this point we have a head with no other entries. Go - * ahead and process it. - */ - rb_erase(&head->href_node, &delayed_refs->href_root); - RB_CLEAR_NODE(&head->href_node); - atomic_dec(&delayed_refs->num_entries); - - /* - * we don't take a ref on the node because we're removing it from the - * tree, so we just steal the ref the tree was holding. - */ - delayed_refs->num_heads--; - if (head->processing == 0) - delayed_refs->num_heads_ready--; + btrfs_delete_ref_head(delayed_refs, head); head->processing = 0; + spin_unlock(&head->lock); spin_unlock(&delayed_refs->lock);