From: Qu Wenruo <quwenruo.btrfs@gmx.com>
To: Josef Bacik <josef@toxicpanda.com>,
linux-btrfs@vger.kernel.org, kernel-team@fb.com, wqu@suse.com
Subject: Re: [PATCH 2/4] btrfs: kill min_allocable_bytes in inc_block_group_ro
Date: Tue, 26 Nov 2019 10:35:31 +0800 [thread overview]
Message-ID: <2d3f9e7b-c432-0eb5-e496-ecc66fda831d@gmx.com> (raw)
In-Reply-To: <20191125144011.146722-3-josef@toxicpanda.com>
[-- Attachment #1.1: Type: text/plain, Size: 2651 bytes --]
On 2019/11/25 下午10:40, Josef Bacik wrote:
> This is a relic from a time before we had a proper reservation mechanism
> and you could end up with really full chunks at chunk allocation time.
> This doesn't make sense anymore, so just kill it.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
> ---
> fs/btrfs/block-group.c | 22 ++++------------------
> 1 file changed, 4 insertions(+), 18 deletions(-)
>
> diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
> index 6934a5b8708f..db539bfc5a52 100644
> --- a/fs/btrfs/block-group.c
> +++ b/fs/btrfs/block-group.c
> @@ -1185,21 +1185,8 @@ static int inc_block_group_ro(struct btrfs_block_group *cache, int force)
> struct btrfs_space_info *sinfo = cache->space_info;
> u64 num_bytes;
> u64 sinfo_used;
> - u64 min_allocable_bytes;
> int ret = -ENOSPC;
>
> - /*
> - * We need some metadata space and system metadata space for
> - * allocating chunks in some corner cases until we force to set
> - * it to be readonly.
> - */
> - if ((sinfo->flags &
> - (BTRFS_BLOCK_GROUP_SYSTEM | BTRFS_BLOCK_GROUP_METADATA)) &&
> - !force)
> - min_allocable_bytes = SZ_1M;
> - else
> - min_allocable_bytes = 0;
> -
> spin_lock(&sinfo->lock);
> spin_lock(&cache->lock);
>
> @@ -1217,10 +1204,9 @@ static int inc_block_group_ro(struct btrfs_block_group *cache, int force)
> * sinfo_used + num_bytes should always <= sinfo->total_bytes.
> *
> * Here we make sure if we mark this bg RO, we still have enough
> - * free space as buffer (if min_allocable_bytes is not 0).
> + * free space as buffer.
> */
> - if (sinfo_used + num_bytes + min_allocable_bytes <=
> - sinfo->total_bytes) {
> + if (sinfo_used + num_bytes + sinfo->total_bytes) {
I guess it's a typo.
It should be "if (sinfo_used + num_bytes <= sinfo->total_bytes) {"
Although the last patch will remove the check, it's still better to keep
each patch works fine to make bisect easier.
Thanks,
Qu
> sinfo->bytes_readonly += num_bytes;
> cache->ro++;
> list_add_tail(&cache->ro_list, &sinfo->ro_bgs);
> @@ -1233,8 +1219,8 @@ static int inc_block_group_ro(struct btrfs_block_group *cache, int force)
> btrfs_info(cache->fs_info,
> "unable to make block group %llu ro", cache->start);
> btrfs_info(cache->fs_info,
> - "sinfo_used=%llu bg_num_bytes=%llu min_allocable=%llu",
> - sinfo_used, num_bytes, min_allocable_bytes);
> + "sinfo_used=%llu bg_num_bytes=%llu",
> + sinfo_used, num_bytes);
> btrfs_dump_space_info(cache->fs_info, cache->space_info, 0, 0);
> }
> return ret;
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-11-26 2:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-25 14:40 [PATCH 0/4][RFC] clean up how we mark block groups read only Josef Bacik
2019-11-25 14:40 ` [PATCH 1/4] btrfs: don't pass system_chunk into can_overcommit Josef Bacik
2019-11-25 15:36 ` Johannes Thumshirn
2019-11-26 2:32 ` Qu Wenruo
2019-11-26 8:42 ` Nikolay Borisov
2019-11-25 14:40 ` [PATCH 2/4] btrfs: kill min_allocable_bytes in inc_block_group_ro Josef Bacik
2019-11-26 2:35 ` Qu Wenruo [this message]
2019-11-25 14:40 ` [PATCH 3/4] btrfs: fix force usage " Josef Bacik
2019-11-26 2:43 ` Qu Wenruo
2019-11-26 4:59 ` Qu Wenruo
2019-11-26 10:09 ` Nikolay Borisov
2019-11-25 14:40 ` [PATCH 4/4] btrfs: use btrfs_can_overcommit " Josef Bacik
2019-11-26 3:00 ` Qu Wenruo
2019-11-26 16:28 ` Josef Bacik
2019-11-26 10:18 ` Nikolay Borisov
2019-11-26 16:25 [PATCH 0/4][v2] clean up how we mark block groups read only Josef Bacik
2019-11-26 16:25 ` [PATCH 2/4] btrfs: kill min_allocable_bytes in inc_block_group_ro Josef Bacik
2019-11-27 10:45 ` 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=2d3f9e7b-c432-0eb5-e496-ecc66fda831d@gmx.com \
--to=quwenruo.btrfs@gmx.com \
--cc=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=wqu@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).