From: Josef Bacik <josef@toxicpanda.com>
To: kernel-team@fb.com, linux-btrfs@vger.kernel.org
Subject: [PATCH 26/42] btrfs: make btrfs_destroy_delayed_refs use btrfs_delayed_ref_lock
Date: Thu, 11 Oct 2018 15:54:15 -0400 [thread overview]
Message-ID: <20181011195431.3441-27-josef@toxicpanda.com> (raw)
In-Reply-To: <20181011195431.3441-1-josef@toxicpanda.com>
We have this open coded in btrfs_destroy_delayed_refs, use the helper
instead.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/disk-io.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 39bd158466cd..121ab180a78a 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4214,16 +4214,9 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
head = rb_entry(node, struct btrfs_delayed_ref_head,
href_node);
- if (!mutex_trylock(&head->mutex)) {
- refcount_inc(&head->refs);
- spin_unlock(&delayed_refs->lock);
-
- mutex_lock(&head->mutex);
- mutex_unlock(&head->mutex);
- btrfs_put_delayed_ref_head(head);
- spin_lock(&delayed_refs->lock);
+ if (btrfs_delayed_ref_lock(delayed_refs, head))
continue;
- }
+
spin_lock(&head->lock);
while ((n = rb_first(&head->ref_tree)) != NULL) {
ref = rb_entry(n, struct btrfs_delayed_ref_node,
--
2.14.3
next prev parent reply other threads:[~2018-10-11 19:55 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 19:53 [PATCH 00/42][v4] My current patch queue Josef Bacik
2018-10-11 19:53 ` [PATCH 01/42] btrfs: add btrfs_delete_ref_head helper Josef Bacik
2018-10-11 19:53 ` [PATCH 02/42] btrfs: add cleanup_ref_head_accounting helper Josef Bacik
2018-10-11 19:53 ` [PATCH 03/42] btrfs: cleanup extent_op handling Josef Bacik
2018-10-11 19:53 ` [PATCH 04/42] btrfs: only track ref_heads in delayed_ref_updates Josef Bacik
2018-10-11 19:53 ` [PATCH 05/42] btrfs: only count ref heads run in __btrfs_run_delayed_refs Josef Bacik
2018-10-11 19:53 ` [PATCH 06/42] btrfs: introduce delayed_refs_rsv Josef Bacik
2018-10-11 19:53 ` [PATCH 07/42] btrfs: check if free bgs for commit Josef Bacik
2018-10-11 19:53 ` [PATCH 08/42] btrfs: dump block_rsv whe dumping space info Josef Bacik
2018-10-11 19:53 ` [PATCH 09/42] btrfs: release metadata before running delayed refs Josef Bacik
2018-10-11 19:53 ` [PATCH 10/42] btrfs: protect space cache inode alloc with nofs Josef Bacik
2018-10-11 19:54 ` [PATCH 11/42] btrfs: fix truncate throttling Josef Bacik
2018-10-11 19:54 ` [PATCH 12/42] btrfs: don't use global rsv for chunk allocation Josef Bacik
2018-10-11 19:54 ` [PATCH 13/42] btrfs: add ALLOC_CHUNK_FORCE to the flushing code Josef Bacik
2018-10-11 19:54 ` [PATCH 14/42] btrfs: reset max_extent_size properly Josef Bacik
2018-10-12 9:02 ` Filipe Manana
2018-10-11 19:54 ` [PATCH 15/42] btrfs: don't enospc all tickets on flush failure Josef Bacik
2018-10-11 19:54 ` [PATCH 16/42] btrfs: loop in inode_rsv_refill Josef Bacik
2018-10-11 19:54 ` [PATCH 17/42] btrfs: run delayed iputs before committing Josef Bacik
2018-10-11 19:54 ` [PATCH 18/42] btrfs: move the dio_sem higher up the callchain Josef Bacik
2018-10-11 19:54 ` [PATCH 19/42] btrfs: set max_extent_size properly Josef Bacik
2018-10-12 8:50 ` Filipe Manana
2018-10-12 17:30 ` David Sterba
2018-10-11 19:54 ` [PATCH 20/42] btrfs: don't use ctl->free_space for max_extent_size Josef Bacik
2018-10-12 9:01 ` Filipe Manana
2018-10-11 19:54 ` [PATCH 21/42] btrfs: reset max_extent_size on clear in a bitmap Josef Bacik
2018-10-11 19:54 ` [PATCH 22/42] btrfs: only run delayed refs if we're committing Josef Bacik
2018-10-11 19:54 ` [PATCH 23/42] btrfs: make sure we create all new bgs Josef Bacik
2018-10-11 19:54 ` [PATCH 24/42] btrfs: assert on non-empty delayed iputs Josef Bacik
2018-10-11 19:54 ` [PATCH 25/42] btrfs: pass delayed_refs_root to btrfs_delayed_ref_lock Josef Bacik
2018-10-11 19:54 ` Josef Bacik [this message]
2018-10-11 19:54 ` [PATCH 27/42] btrfs: make btrfs_destroy_delayed_refs use btrfs_delete_ref_head Josef Bacik
2018-10-11 19:54 ` [PATCH 28/42] btrfs: handle delayed ref head accounting cleanup in abort Josef Bacik
2018-10-11 19:54 ` [PATCH 29/42] btrfs: call btrfs_create_pending_block_groups unconditionally Josef Bacik
2018-10-11 19:54 ` [PATCH 30/42] btrfs: just delete pending bgs if we are aborted Josef Bacik
2018-10-11 19:54 ` [PATCH 31/42] btrfs: cleanup pending bgs on transaction abort Josef Bacik
2018-10-11 19:54 ` [PATCH 32/42] btrfs: only free reserved extent if we didn't insert it Josef Bacik
2018-10-11 20:35 ` Filipe Manana
2018-10-11 19:54 ` [PATCH 33/42] btrfs: fix insert_reserved error handling Josef Bacik
2018-10-12 18:02 ` David Sterba
2018-10-11 19:54 ` [PATCH 34/42] btrfs: wait on ordered extents on abort cleanup Josef Bacik
2018-10-11 19:54 ` [PATCH 35/42] MAINTAINERS: update my email address for btrfs Josef Bacik
2018-10-11 19:54 ` [PATCH 36/42] btrfs: wait on caching when putting the bg cache Josef Bacik
2018-10-11 19:54 ` [PATCH 37/42] btrfs: wakeup cleaner thread when adding delayed iput Josef Bacik
2018-10-11 19:54 ` [PATCH 38/42] btrfs: be more explicit about allowed flush states Josef Bacik
2018-10-11 19:54 ` [PATCH 39/42] btrfs: replace cleaner_delayed_iput_mutex with a waitqueue Josef Bacik
2018-10-11 19:54 ` [PATCH 40/42] btrfs: drop min_size from evict_refill_and_join Josef Bacik
2018-10-11 19:54 ` [PATCH 41/42] btrfs: reserve extra space during evict() Josef Bacik
2018-10-11 19:54 ` [PATCH 42/42] btrfs: don't run delayed_iputs in commit Josef Bacik
2018-10-11 20:36 ` Filipe Manana
-- strict thread matches above, loose matches on Subject: below --
2018-10-12 19:32 [PATCH 00/42][v5] My current patch queue Josef Bacik
2018-10-12 19:32 ` [PATCH 26/42] btrfs: make btrfs_destroy_delayed_refs use btrfs_delayed_ref_lock Josef Bacik
2018-09-28 11:17 [PATCH 00/42][v3] My current patch queue Josef Bacik
2018-09-28 11:18 ` [PATCH 26/42] btrfs: make btrfs_destroy_delayed_refs use btrfs_delayed_ref_lock Josef Bacik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181011195431.3441-27-josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).