@@ -461,7 +461,7 @@ u64 add_new_free_space(struct btrfs_block_group *block_group, u64 start, u64 end
ret = find_first_extent_bit(&info->excluded_extents, start,
&extent_start, &extent_end,
EXTENT_DIRTY | EXTENT_UPTODATE,
- NULL);
+ false, NULL);
if (ret)
break;
@@ -4516,7 +4516,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info,
while (1) {
ret = find_first_extent_bit(dirty_pages, start, &start, &end,
- mark, NULL);
+ mark, false, NULL);
if (ret)
break;
@@ -4556,7 +4556,7 @@ static int btrfs_destroy_pinned_extent(struct btrfs_fs_info *fs_info,
*/
mutex_lock(&fs_info->unused_bg_unpin_mutex);
ret = find_first_extent_bit(unpin, 0, &start, &end,
- EXTENT_DIRTY, &cached_state);
+ EXTENT_DIRTY, false, &cached_state);
if (ret) {
mutex_unlock(&fs_info->unused_bg_unpin_mutex);
break;
@@ -224,7 +224,7 @@ static inline int set_extent_uptodate(struct extent_io_tree *tree, u64 start,
int find_first_extent_bit(struct extent_io_tree *tree, u64 start,
u64 *start_ret, u64 *end_ret, unsigned bits,
- struct extent_state **cached_state);
+ bool exact_match, struct extent_state **cached_state);
void find_first_clear_extent_bit(struct extent_io_tree *tree, u64 start,
u64 *start_ret, u64 *end_ret, unsigned bits);
int find_contiguous_extent_bit(struct extent_io_tree *tree, u64 start,
@@ -2880,7 +2880,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans)
mutex_lock(&fs_info->unused_bg_unpin_mutex);
ret = find_first_extent_bit(unpin, 0, &start, &end,
- EXTENT_DIRTY, &cached_state);
+ EXTENT_DIRTY, false, &cached_state);
if (ret) {
mutex_unlock(&fs_info->unused_bg_unpin_mutex);
break;
@@ -1521,13 +1521,27 @@ void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end)
}
}
-/* find the first state struct with 'bits' set after 'start', and
- * return it. tree->lock must be held. NULL will returned if
- * nothing was found after 'start'
+static bool match_extent_state(struct extent_state *state, unsigned bits,
+ bool exact_match)
+{
+ if (exact_match)
+ return ((state->state & bits) == bits);
+ return (state->state & bits);
+}
+
+/*
+ * Find the first state struct with @bits set after @start.
+ *
+ * NOTE: tree->lock must be hold.
+ *
+ * @exact_match: Do we need to have all @bits set, or just any of
+ * the @bits.
+ *
+ * Return NULL if we can't find a match.
*/
static struct extent_state *
find_first_extent_bit_state(struct extent_io_tree *tree,
- u64 start, unsigned bits)
+ u64 start, unsigned bits, bool exact_match)
{
struct rb_node *node;
struct extent_state *state;
@@ -1542,7 +1556,8 @@ find_first_extent_bit_state(struct extent_io_tree *tree,
while (1) {
state = rb_entry(node, struct extent_state, rb_node);
- if (state->end >= start && (state->state & bits))
+ if (state->end >= start &&
+ match_extent_state(state, bits, exact_match))
return state;
node = rb_next(node);
@@ -1563,7 +1578,7 @@ find_first_extent_bit_state(struct extent_io_tree *tree,
*/
int find_first_extent_bit(struct extent_io_tree *tree, u64 start,
u64 *start_ret, u64 *end_ret, unsigned bits,
- struct extent_state **cached_state)
+ bool exact_match, struct extent_state **cached_state)
{
struct extent_state *state;
int ret = 1;
@@ -1573,7 +1588,8 @@ int find_first_extent_bit(struct extent_io_tree *tree, u64 start,
state = *cached_state;
if (state->end == start - 1 && extent_state_in_tree(state)) {
while ((state = next_state(state)) != NULL) {
- if (state->state & bits)
+ if (match_extent_state(state, bits,
+ exact_match))
goto got_it;
}
free_extent_state(*cached_state);
@@ -1584,7 +1600,7 @@ int find_first_extent_bit(struct extent_io_tree *tree, u64 start,
*cached_state = NULL;
}
- state = find_first_extent_bit_state(tree, start, bits);
+ state = find_first_extent_bit_state(tree, start, bits, exact_match);
got_it:
if (state) {
cache_state_if_flags(state, cached_state, 0);
@@ -1619,7 +1635,7 @@ int find_contiguous_extent_bit(struct extent_io_tree *tree, u64 start,
int ret = 1;
spin_lock(&tree->lock);
- state = find_first_extent_bit_state(tree, start, bits);
+ state = find_first_extent_bit_state(tree, start, bits, false);
if (state) {
*start_ret = state->start;
*end_ret = state->end;
@@ -2413,9 +2429,8 @@ int clean_io_failure(struct btrfs_fs_info *fs_info,
goto out;
spin_lock(&io_tree->lock);
- state = find_first_extent_bit_state(io_tree,
- failrec->start,
- EXTENT_LOCKED);
+ state = find_first_extent_bit_state(io_tree, failrec->start,
+ EXTENT_LOCKED, false);
spin_unlock(&io_tree->lock);
if (state && state->start <= failrec->start &&
@@ -2451,7 +2466,8 @@ void btrfs_free_io_failure_record(struct btrfs_inode *inode, u64 start, u64 end)
return;
spin_lock(&failure_tree->lock);
- state = find_first_extent_bit_state(failure_tree, start, EXTENT_DIRTY);
+ state = find_first_extent_bit_state(failure_tree, start, EXTENT_DIRTY,
+ false);
while (state) {
if (state->start > end)
break;
@@ -1093,7 +1093,7 @@ static noinline_for_stack int write_pinned_extent_entries(
while (start < block_group->start + block_group->length) {
ret = find_first_extent_bit(unpin, start,
&extent_start, &extent_end,
- EXTENT_DIRTY, NULL);
+ EXTENT_DIRTY, false, NULL);
if (ret)
return 0;
@@ -3153,7 +3153,7 @@ int find_next_extent(struct reloc_control *rc, struct btrfs_path *path,
ret = find_first_extent_bit(&rc->processed_blocks,
key.objectid, &start, &end,
- EXTENT_DIRTY, NULL);
+ EXTENT_DIRTY, false, NULL);
if (ret == 0 && start <= key.objectid) {
btrfs_release_path(path);
@@ -974,7 +974,7 @@ int btrfs_write_marked_extents(struct btrfs_fs_info *fs_info,
atomic_inc(&BTRFS_I(fs_info->btree_inode)->sync_writers);
while (!find_first_extent_bit(dirty_pages, start, &start, &end,
- mark, &cached_state)) {
+ mark, false, &cached_state)) {
bool wait_writeback = false;
err = convert_extent_bit(dirty_pages, start, end,
@@ -1029,7 +1029,7 @@ static int __btrfs_wait_marked_extents(struct btrfs_fs_info *fs_info,
u64 end;
while (!find_first_extent_bit(dirty_pages, start, &start, &end,
- EXTENT_NEED_WAIT, &cached_state)) {
+ EXTENT_NEED_WAIT, false, &cached_state)) {
/*
* Ignore -ENOMEM errors returned by clear_extent_bit().
* When committing the transaction, we'll remove any entries
@@ -1382,7 +1382,7 @@ static bool contains_pending_extent(struct btrfs_device *device, u64 *start,
if (!find_first_extent_bit(&device->alloc_state, *start,
&physical_start, &physical_end,
- CHUNK_ALLOCATED, NULL)) {
+ CHUNK_ALLOCATED, false, NULL)) {
if (in_range(physical_start, *start, len) ||
in_range(*start, physical_start,
Currently if we pass mutliple @bits to find_first_extent_bit(), it will return the first range with one or more bits matching @bits. This is fine for current code, since most of them are just doing their own extra checks, and all existing callers only call it with 1 or 2 bits. But for the incoming subpage support, we want the ability to return range with exact match, so that caller can skip some extra checks. So this patch will add a new bool parameter, @exact_match, to find_first_extent_bit() and its callees. Currently all callers just pass 'false' to the new parameter, thus no functional change is introduced. Signed-off-by: Qu Wenruo <wqu@suse.com> --- fs/btrfs/block-group.c | 2 +- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/extent-io-tree.h | 2 +- fs/btrfs/extent-tree.c | 2 +- fs/btrfs/extent_io.c | 42 +++++++++++++++++++++++++------------ fs/btrfs/free-space-cache.c | 2 +- fs/btrfs/relocation.c | 2 +- fs/btrfs/transaction.c | 4 ++-- fs/btrfs/volumes.c | 2 +- 9 files changed, 39 insertions(+), 23 deletions(-)