From: Josef Bacik <josef@toxicpanda.com>
To: kernel-team@fb.com, linux-btrfs@vger.kernel.org
Cc: Josef Bacik <jbacik@fb.com>
Subject: [PATCH 19/36] btrfs: set max_extent_size properly
Date: Tue, 11 Sep 2018 13:57:50 -0400 [thread overview]
Message-ID: <20180911175807.26181-20-josef@toxicpanda.com> (raw)
In-Reply-To: <20180911175807.26181-1-josef@toxicpanda.com>
From: Josef Bacik <jbacik@fb.com>
We can't use entry->bytes if our entry is a bitmap entry, we need to use
entry->max_extent_size in that case. Fix up all the logic to make this
consistent.
Signed-off-by: Josef Bacik <jbacik@fb.com>
---
fs/btrfs/free-space-cache.c | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index e077ad3b4549..2e96ee7da3ec 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -1770,6 +1770,18 @@ static int search_bitmap(struct btrfs_free_space_ctl *ctl,
return -1;
}
+static void set_max_extent_size(struct btrfs_free_space *entry,
+ u64 *max_extent_size)
+{
+ if (entry->bitmap) {
+ if (entry->max_extent_size > *max_extent_size)
+ *max_extent_size = entry->max_extent_size;
+ } else {
+ if (entry->bytes > *max_extent_size)
+ *max_extent_size = entry->bytes;
+ }
+}
+
/* Cache the size of the max extent in bytes */
static struct btrfs_free_space *
find_free_space(struct btrfs_free_space_ctl *ctl, u64 *offset, u64 *bytes,
@@ -1791,8 +1803,7 @@ find_free_space(struct btrfs_free_space_ctl *ctl, u64 *offset, u64 *bytes,
for (node = &entry->offset_index; node; node = rb_next(node)) {
entry = rb_entry(node, struct btrfs_free_space, offset_index);
if (entry->bytes < *bytes) {
- if (entry->bytes > *max_extent_size)
- *max_extent_size = entry->bytes;
+ set_max_extent_size(entry, max_extent_size);
continue;
}
@@ -1810,8 +1821,7 @@ find_free_space(struct btrfs_free_space_ctl *ctl, u64 *offset, u64 *bytes,
}
if (entry->bytes < *bytes + align_off) {
- if (entry->bytes > *max_extent_size)
- *max_extent_size = entry->bytes;
+ set_max_extent_size(entry, max_extent_size);
continue;
}
@@ -1823,8 +1833,8 @@ find_free_space(struct btrfs_free_space_ctl *ctl, u64 *offset, u64 *bytes,
*offset = tmp;
*bytes = size;
return entry;
- } else if (size > *max_extent_size) {
- *max_extent_size = size;
+ } else {
+ set_max_extent_size(entry, max_extent_size);
}
continue;
}
@@ -2684,8 +2694,7 @@ static u64 btrfs_alloc_from_bitmap(struct btrfs_block_group_cache *block_group,
err = search_bitmap(ctl, entry, &search_start, &search_bytes, true);
if (err) {
- if (search_bytes > *max_extent_size)
- *max_extent_size = search_bytes;
+ set_max_extent_size(entry, max_extent_size);
return 0;
}
@@ -2722,8 +2731,8 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
entry = rb_entry(node, struct btrfs_free_space, offset_index);
while (1) {
- if (entry->bytes < bytes && entry->bytes > *max_extent_size)
- *max_extent_size = entry->bytes;
+ if (entry->bytes < bytes)
+ set_max_extent_size(entry, max_extent_size);
if (entry->bytes < bytes ||
(!entry->bitmap && entry->offset < min_start)) {
--
2.14.3
next prev parent reply other threads:[~2018-09-11 22:59 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 17:57 [PATCH 00/35][v2] My current patch queue Josef Bacik
2018-09-11 17:57 ` [PATCH 01/36] btrfs: add btrfs_delete_ref_head helper Josef Bacik
2018-09-11 22:52 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 02/36] btrfs: add cleanup_ref_head_accounting helper Josef Bacik
2018-09-11 17:57 ` [PATCH 03/36] btrfs: cleanup extent_op handling Josef Bacik
2018-09-11 23:24 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 04/36] btrfs: only track ref_heads in delayed_ref_updates Josef Bacik
2018-09-11 17:57 ` [PATCH 05/36] btrfs: only count ref heads run in __btrfs_run_delayed_refs Josef Bacik
2018-09-11 23:07 ` Omar Sandoval
2018-09-12 17:46 ` David Sterba
2018-09-11 17:57 ` [PATCH 06/36] btrfs: introduce delayed_refs_rsv Josef Bacik
2018-09-11 17:57 ` [PATCH 07/36] btrfs: check if free bgs for commit Josef Bacik
2018-09-11 23:09 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 08/36] btrfs: dump block_rsv whe dumping space info Josef Bacik
2018-09-11 23:11 ` Omar Sandoval
2018-09-12 17:24 ` David Sterba
2018-09-11 17:57 ` [PATCH 09/36] btrfs: release metadata before running delayed refs Josef Bacik
2018-09-11 17:57 ` [PATCH 10/36] btrfs: protect space cache inode alloc with nofs Josef Bacik
2018-09-11 17:57 ` [PATCH 11/36] btrfs: fix truncate throttling Josef Bacik
2018-09-11 17:57 ` [PATCH 12/36] btrfs: don't use global rsv for chunk allocation Josef Bacik
2018-09-11 17:57 ` [PATCH 13/36] btrfs: add ALLOC_CHUNK_FORCE to the flushing code Josef Bacik
2018-09-11 17:57 ` [PATCH 14/36] btrfs: reset max_extent_size properly Josef Bacik
2018-09-18 23:54 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 15/36] btrfs: don't enospc all tickets on flush failure Josef Bacik
2018-09-11 17:57 ` [PATCH 16/36] btrfs: run delayed iputs before committing Josef Bacik
2018-09-18 23:59 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 17/36] btrfs: loop in inode_rsv_refill Josef Bacik
2018-09-19 0:17 ` Omar Sandoval
2018-09-11 17:57 ` [PATCH 18/36] btrfs: move the dio_sem higher up the callchain Josef Bacik
2018-09-11 17:57 ` Josef Bacik [this message]
2018-09-11 17:57 ` [PATCH 20/36] btrfs: don't use ctl->free_space for max_extent_size Josef Bacik
2018-09-11 17:57 ` [PATCH 21/36] btrfs: reset max_extent_size on clear in a bitmap Josef Bacik
2018-09-11 17:57 ` [PATCH 22/36] btrfs: only run delayed refs if we're committing Josef Bacik
2018-09-11 17:57 ` [PATCH 23/36] btrfs: make sure we create all new bgs Josef Bacik
2018-09-11 17:57 ` [PATCH 24/36] btrfs: assert on non-empty delayed iputs Josef Bacik
2018-09-11 17:57 ` [PATCH 25/36] btrfs: pass delayed_refs_root to btrfs_delayed_ref_lock Josef Bacik
2018-09-11 17:57 ` [PATCH 26/36] btrfs: make btrfs_destroy_delayed_refs use btrfs_delayed_ref_lock Josef Bacik
2018-09-11 17:57 ` [PATCH 27/36] btrfs: make btrfs_destroy_delayed_refs use btrfs_delete_ref_head Josef Bacik
2018-09-11 17:57 ` [PATCH 28/36] btrfs: handle delayed ref head accounting cleanup in abort Josef Bacik
2018-09-11 17:58 ` [PATCH 29/36] btrfs: call btrfs_create_pending_block_groups unconditionally Josef Bacik
2018-09-11 17:58 ` [PATCH 30/36] btrfs: just delete pending bgs if we are aborted Josef Bacik
2018-09-11 17:58 ` [PATCH 31/36] btrfs: cleanup pending bgs on transaction abort Josef Bacik
2018-09-11 17:58 ` [PATCH 32/36] btrfs: clear delayed_refs_rsv for dirty bg cleanup Josef Bacik
2018-09-19 0:21 ` Omar Sandoval
2018-09-11 17:58 ` [PATCH 33/36] btrfs: only free reserved extent if we didn't insert it Josef Bacik
2018-09-19 0:20 ` Omar Sandoval
2018-09-11 17:58 ` [PATCH 34/36] btrfs: fix insert_reserved error handling Josef Bacik
2018-09-11 17:58 ` [PATCH 35/36] btrfs: wait on ordered extents on abort cleanup Josef Bacik
2018-09-11 17:58 ` [PATCH 36/36] MAINTAINERS: update my email address for btrfs 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=20180911175807.26181-20-josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=jbacik@fb.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;
as well as URLs for NNTP newsgroup(s).