leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: lift start and end parameters to callers of insert_state

Browse Source 
Let callers of insert_state to set up the extent state to allow further
simplifications of the parameters.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2020-06-25 17:18:24 +02:00
parent c7e118cf98
commit cee5126825
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fs/btrfs/extent_io.c
View File

@ -524,21 +524,14 @@ static void set_state_bits(struct extent_io_tree *tree,
* probably isn't what you want to call (see set/clear_extent_bit). * probably isn't what you want to call (see set/clear_extent_bit).
*/ */
static int insert_state(struct extent_io_tree *tree, static int insert_state(struct extent_io_tree *tree,
struct extent_state *state, u64 start, u64 end, struct extent_state *state,
struct rb_node ***node_in, struct rb_node ***node_in,
struct rb_node **parent_in, struct rb_node **parent_in,
u32 *bits, struct extent_changeset *changeset) u32 *bits, struct extent_changeset *changeset)
{ {
struct rb_node **node; struct rb_node **node;
struct rb_node *parent; struct rb_node *parent;
const u64 end = state->end;
if (end < start) {
btrfs_err(tree->fs_info,
"insert state: end < start %llu %llu", end, start);
WARN_ON(1);
}
state->start = start;
state->end = end;
set_state_bits(tree, state, bits, changeset); set_state_bits(tree, state, bits, changeset);
@ -563,7 +556,7 @@ static int insert_state(struct extent_io_tree *tree,
} else { } else {
btrfs_err(tree->fs_info, btrfs_err(tree->fs_info,
"found node %llu %llu on insert of %llu %llu", "found node %llu %llu on insert of %llu %llu",
entry->start, entry->end, start, end); entry->start, entry->end, state->start, end);
return -EEXIST; return -EEXIST;
} }
} }
@ -1027,8 +1020,9 @@ again:
if (!node) { if (!node) {
prealloc = alloc_extent_state_atomic(prealloc); prealloc = alloc_extent_state_atomic(prealloc);
BUG_ON(!prealloc); BUG_ON(!prealloc);
err = insert_state(tree, prealloc, start, end, prealloc->start = start;
&p, &parent, &bits, changeset); prealloc->end = end;
err = insert_state(tree, prealloc, &p, &parent, &bits, changeset);
if (err) if (err)
extent_io_tree_panic(tree, err); extent_io_tree_panic(tree, err);
@ -1144,8 +1138,9 @@ hit_next:
* Avoid to free 'prealloc' if it can be merged with * Avoid to free 'prealloc' if it can be merged with
* the later extent. * the later extent.
*/ */
err = insert_state(tree, prealloc, start, this_end, prealloc->start = start;
NULL, NULL, &bits, changeset); prealloc->end = this_end;
err = insert_state(tree, prealloc, NULL, NULL, &bits, changeset);
if (err) if (err)
extent_io_tree_panic(tree, err); extent_io_tree_panic(tree, err);
@ -1268,8 +1263,9 @@ again:
err = -ENOMEM; err = -ENOMEM;
goto out; goto out;
} }
err = insert_state(tree, prealloc, start, end, prealloc->start = start;
&p, &parent, &bits, NULL); prealloc->end = end;
err = insert_state(tree, prealloc, &p, &parent, &bits, NULL);
if (err) if (err)
extent_io_tree_panic(tree, err); extent_io_tree_panic(tree, err);
cache_state(prealloc, cached_state); cache_state(prealloc, cached_state);
@ -1366,8 +1362,9 @@ hit_next:
* Avoid to free 'prealloc' if it can be merged with * Avoid to free 'prealloc' if it can be merged with
* the later extent. * the later extent.
*/ */
err = insert_state(tree, prealloc, start, this_end, prealloc->start = start;
NULL, NULL, &bits, NULL); prealloc->end = this_end;
err = insert_state(tree, prealloc, NULL, NULL, &bits, NULL);
if (err) if (err)
extent_io_tree_panic(tree, err); extent_io_tree_panic(tree, err);
cache_state(prealloc, cached_state); cache_state(prealloc, cached_state);