public inbox for linux-btrfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 22/43] btrfs: hold a ref on the root in prepare_to_merge
Date: Fri, 17 Jan 2020 08:47:37 -0500	[thread overview]
Message-ID: <20200117134758.41494-23-josef@toxicpanda.com> (raw)
In-Reply-To: <20200117134758.41494-1-josef@toxicpanda.com>

We look up the reloc roots corresponding root, we need to hold a ref on
that root.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
 fs/btrfs/relocation.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 05a301204fd9..0068b7b940f8 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2474,6 +2474,8 @@ int prepare_to_merge(struct reloc_control *rc, int err)
 		list_del_init(&reloc_root->root_list);
 
 		root = read_fs_root(fs_info, reloc_root->root_key.offset);
+		if (!btrfs_grab_fs_root(root))
+			BUG();
 		BUG_ON(IS_ERR(root));
 		BUG_ON(root->reloc_root != reloc_root);
 
@@ -2486,6 +2488,7 @@ int prepare_to_merge(struct reloc_control *rc, int err)
 		btrfs_update_reloc_root(trans, root);
 
 		list_add(&reloc_root->root_list, &reloc_roots);
+		btrfs_put_fs_root(root);
 	}
 
 	list_splice(&reloc_roots, &rc->reloc_roots);
-- 
2.24.1


  parent reply	other threads:[~2020-01-17 13:48 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-17 13:47 [PATCH 00/43][v3] Cleanup how we handle root refs, part 2 Josef Bacik
2020-01-17 13:47 ` [PATCH 01/43] btrfs: push __setup_root into btrfs_alloc_root Josef Bacik
2020-01-17 13:47 ` [PATCH 02/43] btrfs: move fs root init stuff into btrfs_init_fs_root Josef Bacik
2020-01-17 13:47 ` [PATCH 03/43] btrfs: make btrfs_find_orphan_roots use btrfs_get_fs_root Josef Bacik
2020-01-17 13:47 ` [PATCH 04/43] btrfs: export and use btrfs_read_tree_root Josef Bacik
2020-01-17 13:47 ` [PATCH 05/43] btrfs: make relocation use btrfs_read_tree_root() Josef Bacik
2020-01-17 13:47 ` [PATCH 06/43] btrfs: kill btrfs_read_fs_root Josef Bacik
2020-01-17 13:47 ` [PATCH 07/43] btrfs: kill the btrfs_read_fs_root_no_name helper Josef Bacik
2020-01-17 13:47 ` [PATCH 08/43] btrfs: make the fs root init functions static Josef Bacik
2020-01-17 13:47 ` [PATCH 09/43] btrfs: handle NULL roots in btrfs_put/btrfs_grab_fs_root Josef Bacik
2020-01-17 13:47 ` [PATCH 10/43] btrfs: hold a ref on fs roots while they're in the radix tree Josef Bacik
2020-01-17 13:47 ` [PATCH 11/43] btrfs: hold a ref on the root in resolve_indirect_ref Josef Bacik
2020-01-17 13:47 ` [PATCH 12/43] btrfs: hold a root ref in btrfs_get_dentry Josef Bacik
2020-01-17 13:47 ` [PATCH 13/43] btrfs: hold a ref on the root in __btrfs_run_defrag_inode Josef Bacik
2020-01-17 13:47 ` [PATCH 14/43] btrfs: hold a ref on the root in fixup_tree_root_location Josef Bacik
2020-01-17 13:47 ` [PATCH 15/43] btrfs: hold a ref on the root in create_subvol Josef Bacik
2020-01-17 13:47 ` [PATCH 16/43] btrfs: hold a ref on the root in search_ioctl Josef Bacik
2020-01-17 13:47 ` [PATCH 17/43] btrfs: hold a ref on the root in btrfs_search_path_in_tree Josef Bacik
2020-01-17 13:47 ` [PATCH 18/43] btrfs: hold a ref on the root in btrfs_search_path_in_tree_user Josef Bacik
2020-01-17 13:47 ` [PATCH 19/43] btrfs: hold a ref on the root in btrfs_ioctl_get_subvol_info Josef Bacik
2020-01-17 13:47 ` [PATCH 20/43] btrfs: hold ref on root in btrfs_ioctl_default_subvol Josef Bacik
2020-01-17 13:47 ` [PATCH 21/43] btrfs: hold a ref on the root in build_backref_tree Josef Bacik
2020-01-17 13:47 ` Josef Bacik [this message]
2020-01-17 13:47 ` [PATCH 23/43] btrfs: hold a ref on the root in merge_reloc_roots Josef Bacik
2020-01-17 13:47 ` [PATCH 24/43] btrfs: hold a ref on the root in record_reloc_root_in_trans Josef Bacik
2020-01-17 13:47 ` [PATCH 25/43] btrfs: hold a ref on the root in find_data_references Josef Bacik
2020-01-17 13:47 ` [PATCH 26/43] btrfs: hold a ref on the root in create_reloc_inode Josef Bacik
2020-01-17 13:47 ` [PATCH 27/43] btrfs: hold a ref on the root in btrfs_recover_relocation Josef Bacik
2020-01-17 13:47 ` [PATCH 28/43] btrfs: push grab_fs_root into read_fs_root Josef Bacik
2020-01-17 13:47 ` [PATCH 29/43] btrfs: hold a ref for the root in btrfs_find_orphan_roots Josef Bacik
2020-01-17 13:47 ` [PATCH 30/43] btrfs: hold a ref on the root in scrub_print_warning_inode Josef Bacik
2020-01-17 13:47 ` [PATCH 31/43] btrfs: hold a ref on the root in btrfs_ioctl_send Josef Bacik
2020-01-17 13:47 ` [PATCH 32/43] btrfs: hold a ref on the root in get_subvol_name_from_objectid Josef Bacik
2020-01-17 13:47 ` [PATCH 33/43] btrfs: hold a ref on the root in create_pending_snapshot Josef Bacik
2020-01-17 13:47 ` [PATCH 34/43] btrfs: hold a ref on the root in btrfs_recover_log_trees Josef Bacik
2020-01-17 13:47 ` [PATCH 35/43] btrfs: hold a ref on the root in btrfs_check_uuid_tree_entry Josef Bacik
2020-01-17 13:47 ` [PATCH 36/43] btrfs: hold a ref on the root in open_ctree Josef Bacik
2020-01-17 13:47 ` [PATCH 37/43] btrfs: use btrfs_put_fs_root to free roots always Josef Bacik
2020-01-17 13:47 ` [PATCH 38/43] btrfs: push btrfs_grab_fs_root into btrfs_get_fs_root Josef Bacik
2020-01-17 13:47 ` [PATCH 39/43] btrfs: free more things in btrfs_free_fs_info Josef Bacik
2020-01-17 13:47 ` [PATCH 40/43] btrfs: move fs_info init work into it's own helper function Josef Bacik
2020-01-17 13:47 ` [PATCH 41/43] btrfs: make the init of static elements in fs_info separate Josef Bacik
2020-01-17 13:47 ` [PATCH 42/43] btrfs: add a leak check for roots Josef Bacik
2020-01-17 13:47 ` [PATCH 43/43] btrfs: rename btrfs_put_fs_root and btrfs_grab_fs_root Josef Bacik
  -- strict thread matches above, loose matches on Subject: below --
2020-01-17 21:25 [PATCH 00/43][v4] Cleanup how we handle root refs, part 1 Josef Bacik
2020-01-17 21:25 ` [PATCH 22/43] btrfs: hold a ref on the root in prepare_to_merge 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=20200117134758.41494-23-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