From: David Sterba <dsterba@suse.cz>
To: Josef Bacik <josef@toxicpanda.com>
Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 32/44] btrfs: hold a ref on the root in get_subvol_name_from_objectid
Date: Wed, 5 Feb 2020 16:19:02 +0100 [thread overview]
Message-ID: <20200205151902.GS2654@twin.jikos.cz> (raw)
In-Reply-To: <20200124143301.2186319-33-josef@toxicpanda.com>
On Fri, Jan 24, 2020 at 09:32:49AM -0500, Josef Bacik wrote:
> We lookup the name of a subvol which means we'll cross into different
> roots. Hold a ref while we're doing the look ups in the fs_root we're
> searching.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
> ---
> fs/btrfs/super.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
> index 3118bc01321e..5c3a1b7de6ee 100644
> --- a/fs/btrfs/super.c
> +++ b/fs/btrfs/super.c
> @@ -1101,6 +1101,10 @@ static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
> ret = PTR_ERR(fs_root);
> goto err;
> }
> + if (!btrfs_grab_fs_root(fs_root)) {
> + ret = -ENOENT;
> + goto err;
> + }
>
> /*
> * Walk up the filesystem tree by inode refs until we hit the
> @@ -1113,13 +1117,16 @@ static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
>
> ret = btrfs_search_slot(NULL, fs_root, &key, path, 0, 0);
> if (ret < 0) {
> + btrfs_put_fs_root(fs_root);
> goto err;
> } else if (ret > 0) {
> ret = btrfs_previous_item(fs_root, path, dirid,
> BTRFS_INODE_REF_KEY);
> if (ret < 0) {
> + btrfs_put_fs_root(fs_root);
> goto err;
> } else if (ret > 0) {
> + btrfs_put_fs_root(fs_root);
> ret = -ENOENT;
> goto err;
> }
> @@ -1136,6 +1143,7 @@ static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
> ptr -= len + 1;
> if (ptr < name) {
> ret = -ENAMETOOLONG;
> + btrfs_put_fs_root(fs_root);
> goto err;
> }
> read_extent_buffer(path->nodes[0], ptr + 1,
> @@ -1143,6 +1151,7 @@ static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
> ptr[0] = '/';
> btrfs_release_path(path);
> }
> + btrfs_put_fs_root(fs_root);
> }
>
> btrfs_free_path(path);
All the put_fs_root before goto err can and should be merged into the
exit block that's already there.
> --
> 2.24.1
next prev parent reply other threads:[~2020-02-05 15:19 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 14:32 [PATCH 00/44][v5] Cleanup how we handle root refs, part 1 Josef Bacik
2020-01-24 14:32 ` [PATCH 01/44] btrfs: push __setup_root into btrfs_alloc_root Josef Bacik
2020-02-04 22:05 ` David Sterba
2020-01-24 14:32 ` [PATCH 02/44] btrfs: move fs root init stuff into btrfs_init_fs_root Josef Bacik
2020-01-24 14:32 ` [PATCH 03/44] btrfs: make btrfs_find_orphan_roots use btrfs_get_fs_root Josef Bacik
2020-01-24 14:32 ` [PATCH 04/44] btrfs: export and use btrfs_read_tree_root Josef Bacik
2020-01-24 14:32 ` [PATCH 05/44] btrfs: make relocation use btrfs_read_tree_root() Josef Bacik
2020-01-24 14:32 ` [PATCH 06/44] btrfs: kill btrfs_read_fs_root Josef Bacik
2020-01-24 14:32 ` [PATCH 07/44] btrfs: kill the btrfs_read_fs_root_no_name helper Josef Bacik
2020-01-24 14:32 ` [PATCH 08/44] btrfs: make the fs root init functions static Josef Bacik
2020-01-24 14:32 ` [PATCH 09/44] btrfs: handle NULL roots in btrfs_put/btrfs_grab_fs_root Josef Bacik
2020-01-24 14:32 ` [PATCH 10/44] btrfs: hold a ref on fs roots while they're in the radix tree Josef Bacik
2020-01-24 14:32 ` [PATCH 11/44] btrfs: hold a ref on the root in resolve_indirect_ref Josef Bacik
2020-01-24 14:32 ` [PATCH 12/44] btrfs: hold a root ref in btrfs_get_dentry Josef Bacik
2020-01-24 14:32 ` [PATCH 13/44] btrfs: hold a ref on the root in __btrfs_run_defrag_inode Josef Bacik
2020-01-24 14:32 ` [PATCH 14/44] btrfs: hold a ref on the root in fixup_tree_root_location Josef Bacik
2020-01-24 14:32 ` [PATCH 15/44] btrfs: hold a ref on the root in create_subvol Josef Bacik
2020-01-24 14:32 ` [PATCH 16/44] btrfs: hold a ref on the root in search_ioctl Josef Bacik
2020-01-24 14:32 ` [PATCH 17/44] btrfs: hold a ref on the root in btrfs_search_path_in_tree Josef Bacik
2020-02-05 14:30 ` David Sterba
2020-01-24 14:32 ` [PATCH 18/44] btrfs: hold a ref on the root in btrfs_search_path_in_tree_user Josef Bacik
2020-02-05 14:37 ` David Sterba
2020-01-24 14:32 ` [PATCH 19/44] btrfs: hold a ref on the root in btrfs_ioctl_get_subvol_info Josef Bacik
2020-01-24 14:32 ` [PATCH 20/44] btrfs: hold ref on root in btrfs_ioctl_default_subvol Josef Bacik
2020-01-24 14:32 ` [PATCH 21/44] btrfs: hold a ref on the root in build_backref_tree Josef Bacik
2020-02-05 14:46 ` David Sterba
2020-01-24 14:32 ` [PATCH 22/44] btrfs: hold a ref on the root in prepare_to_merge Josef Bacik
2020-02-05 14:52 ` David Sterba
2020-01-24 14:32 ` [PATCH 23/44] btrfs: hold a ref on the root in merge_reloc_roots Josef Bacik
2020-01-24 14:32 ` [PATCH 24/44] btrfs: hold a ref on the root in record_reloc_root_in_trans Josef Bacik
2020-01-24 14:32 ` [PATCH 25/44] btrfs: hold a ref on the root in find_data_references Josef Bacik
2020-01-24 14:32 ` [PATCH 26/44] btrfs: hold a ref on the root in create_reloc_inode Josef Bacik
2020-01-24 14:32 ` [PATCH 27/44] btrfs: hold a ref on the root in btrfs_recover_relocation Josef Bacik
2020-02-05 15:00 ` David Sterba
2020-02-06 16:26 ` David Sterba
2020-02-06 16:30 ` Josef Bacik
2020-01-24 14:32 ` [PATCH 28/44] btrfs: push grab_fs_root into read_fs_root Josef Bacik
2020-01-24 14:32 ` [PATCH 29/44] btrfs: hold a ref for the root in btrfs_find_orphan_roots Josef Bacik
2020-02-05 15:06 ` David Sterba
2020-01-24 14:32 ` [PATCH 30/44] btrfs: hold a ref on the root in scrub_print_warning_inode Josef Bacik
2020-01-24 14:32 ` [PATCH 31/44] btrfs: hold a ref on the root in btrfs_ioctl_send Josef Bacik
2020-02-05 15:16 ` David Sterba
2020-01-24 14:32 ` [PATCH 32/44] btrfs: hold a ref on the root in get_subvol_name_from_objectid Josef Bacik
2020-02-05 15:19 ` David Sterba [this message]
2020-02-06 15:24 ` [PATCH][v2] " Josef Bacik
2020-01-24 14:32 ` [PATCH 33/44] btrfs: hold a ref on the root in create_pending_snapshot Josef Bacik
2020-01-24 14:32 ` [PATCH 34/44] btrfs: hold a ref on the root in btrfs_recover_log_trees Josef Bacik
2020-01-24 14:32 ` [PATCH 35/44] btrfs: hold a ref on the root in btrfs_check_uuid_tree_entry Josef Bacik
2020-01-24 14:32 ` [PATCH 36/44] btrfs: move free_fs_info Josef Bacik
2020-01-24 14:52 ` Nikolay Borisov
2020-01-24 14:32 ` [PATCH 37/44] btrfs: hold a ref on the root in open_ctree Josef Bacik
2020-01-24 14:32 ` [PATCH 38/44] btrfs: use btrfs_put_fs_root to free roots always Josef Bacik
2020-01-24 14:32 ` [PATCH 39/44] btrfs: push btrfs_grab_fs_root into btrfs_get_fs_root Josef Bacik
2020-01-24 14:32 ` [PATCH 40/44] btrfs: free more things in btrfs_free_fs_info Josef Bacik
2020-01-24 14:32 ` [PATCH 41/44] btrfs: move fs_info init work into it's own helper function Josef Bacik
2020-01-24 14:32 ` [PATCH 42/44] btrfs: make the init of static elements in fs_info separate Josef Bacik
2020-01-24 14:33 ` [PATCH 43/44] btrfs: add a leak check for roots Josef Bacik
2020-01-24 14:33 ` [PATCH 44/44] btrfs: rename btrfs_put_fs_root and btrfs_grab_fs_root Josef Bacik
2020-02-05 15:44 ` David Sterba
2020-02-04 23:48 ` [PATCH 00/44][v5] Cleanup how we handle root refs, part 1 David Sterba
2020-02-05 15:48 ` David Sterba
2020-02-06 16:59 ` David Sterba
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=20200205151902.GS2654@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=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