From: David Sterba <dsterba@suse.cz>
To: fdmanana@kernel.org
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH v2] btrfs: remove NULL transaction support for btrfs_lookup_extent_info()
Date: Tue, 18 Jun 2024 19:33:27 +0200 [thread overview]
Message-ID: <20240618173327.GJ25756@twin.jikos.cz> (raw)
In-Reply-To: <a35d5db1edc40dff98f30a46ada610ec4604114d.1718706031.git.fdmanana@suse.com>
On Tue, Jun 18, 2024 at 11:22:01AM +0100, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
>
> There are no callers of btrfs_lookup_extent_info() that pass a NULL value
> for the transaction handle argument, so there's no point in having special
> logic to deal with the NULL. The last caller that passed a NULL value was
> removed in commit 19b546d7a1b2 ("btrfs: relocation:
> Use btrfs_find_all_leafs to locate data extent parent tree leaves").
>
> So remove the NULL handling from btrfs_lookup_extent_info().
>
> Signed-off-by: Filipe Manana <fdmanana@suse.com>
> ---
>
> V2: Remove the transaction abort logic check for NULL transaction too.
>
> fs/btrfs/extent-tree.c | 16 ++--------------
> 1 file changed, 2 insertions(+), 14 deletions(-)
>
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index 58a72a57414a..21d123d392c0 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -126,11 +126,6 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
> if (!path)
> return -ENOMEM;
>
> - if (!trans) {
> - path->skip_locking = 1;
> - path->search_commit_root = 1;
> - }
> -
> search_again:
> key.objectid = bytenr;
> key.offset = offset;
> @@ -171,11 +166,7 @@ int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
> btrfs_err(fs_info,
> "unexpected extent item size, has %u expect >= %zu",
> item_size, sizeof(*ei));
> - if (trans)
> - btrfs_abort_transaction(trans, ret);
> - else
> - btrfs_handle_fs_error(fs_info, ret, NULL);
I have a WIP to remove btrfs_handle_fs_error() and for this one I
remember there was a NULL passed somehow to the function, it was
indirectly from the tree walking helpers. But I can't find it and after
another look there seems to be a valid pointer passed all times.
Reviewed-by: David Sterba <dsterba@suse.com>
next prev parent reply other threads:[~2024-06-18 17:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-18 7:32 [PATCH] btrfs: remove NULL transaction support for btrfs_lookup_extent_info() fdmanana
2024-06-18 10:20 ` Qu Wenruo
2024-06-18 10:22 ` [PATCH v2] " fdmanana
2024-06-18 17:33 ` David Sterba [this message]
2024-06-18 21:35 ` Qu Wenruo
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=20240618173327.GJ25756@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=fdmanana@kernel.org \
--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