From: David Sterba <dsterba@suse.cz>
To: Nikolay Borisov <nborisov@suse.com>
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 2/3] btrfs: Open code __btrfs_free_reserved_extent in btrfs_free_reserved_extent
Date: Wed, 27 Nov 2019 19:55:23 +0100 [thread overview]
Message-ID: <20191127185523.GY2734@twin.jikos.cz> (raw)
In-Reply-To: <20191121120331.29070-3-nborisov@suse.com>
On Thu, Nov 21, 2019 at 02:03:30PM +0200, Nikolay Borisov wrote:
> __btrfs_free_reserved_extent performs 2 entirely different operations
> depending on whether its 'pin' argument is true or false. This patch
> lifts the 2nd case (pin is false) into it's sole caller
> btrfs_free_reserved_extent. No semantics changes.
>
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> ---
> fs/btrfs/extent-tree.c | 28 ++++++++++++++++------------
> 1 file changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index 613c7bbf5cbd..dae6f8d07852 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -4164,17 +4164,7 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
> return -ENOSPC;
> }
>
> - if (pin) {
> - ret = pin_down_extent(cache, start, len, 1);
> - if (ret)
> - goto out;
> - } else {
> - btrfs_add_free_space(cache, start, len);
> - btrfs_free_reserved_bytes(cache, len, delalloc);
> - trace_btrfs_reserved_extent_free(fs_info, start, len);
> - }
> -
> -out:
> + ret = pin_down_extent(cache, start, len, 1);
> btrfs_put_block_group(cache);
> return ret;
> }
> @@ -4182,7 +4172,21 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
> int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
> u64 start, u64 len, int delalloc)
> {
> - return __btrfs_free_reserved_extent(fs_info, start, len, 0, delalloc);
> + struct btrfs_block_group *cache;
> +
> + cache = btrfs_lookup_block_group(fs_info, start);
> + if (!cache) {
> + btrfs_err(fs_info, "Unable to find block group for %llu",
> + start);
I think the error message should be either removed or at least hidden
under enospc_debug. This has little value to a normal user and also the
function can be indirectly called many times, spamming logs.
next prev parent reply other threads:[~2019-11-27 18:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 12:03 [PATCH 0/3] 3 misc patches Nikolay Borisov
2019-11-21 12:03 ` [PATCH 1/3] btrfs: Don't discard unwritten extents Nikolay Borisov
2019-11-27 16:06 ` David Sterba
2019-11-27 16:15 ` David Sterba
2019-11-27 16:23 ` Nikolay Borisov
2019-11-27 17:37 ` Filipe Manana
2019-11-21 12:03 ` [PATCH 2/3] btrfs: Open code __btrfs_free_reserved_extent in btrfs_free_reserved_extent Nikolay Borisov
2019-11-27 18:55 ` David Sterba [this message]
2019-11-29 8:44 ` Nikolay Borisov
2019-11-21 12:03 ` [PATCH 3/3] btrfs: Rename __btrfs_free_reserved_extent to btrfs_pin_reserved_extent Nikolay Borisov
2019-11-28 11:14 ` David Sterba
2019-12-03 17:16 ` [PATCH 0/3] 3 misc patches 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=20191127185523.GY2734@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.com \
/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).