btrfs: rename err to ret in convert_extent_bit()
Unify naming of return value to the preferred way. Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
cbb6b5d208
commit
d5b634ae1f
@ -1312,7 +1312,7 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
|
|||||||
struct extent_state *prealloc = NULL;
|
struct extent_state *prealloc = NULL;
|
||||||
struct rb_node **p = NULL;
|
struct rb_node **p = NULL;
|
||||||
struct rb_node *parent = NULL;
|
struct rb_node *parent = NULL;
|
||||||
int err = 0;
|
int ret = 0;
|
||||||
u64 last_start;
|
u64 last_start;
|
||||||
u64 last_end;
|
u64 last_end;
|
||||||
bool first_iteration = true;
|
bool first_iteration = true;
|
||||||
@ -1351,7 +1351,7 @@ again:
|
|||||||
if (!state) {
|
if (!state) {
|
||||||
prealloc = alloc_extent_state_atomic(prealloc);
|
prealloc = alloc_extent_state_atomic(prealloc);
|
||||||
if (!prealloc) {
|
if (!prealloc) {
|
||||||
err = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
prealloc->start = start;
|
prealloc->start = start;
|
||||||
@ -1402,14 +1402,14 @@ hit_next:
|
|||||||
if (state->start < start) {
|
if (state->start < start) {
|
||||||
prealloc = alloc_extent_state_atomic(prealloc);
|
prealloc = alloc_extent_state_atomic(prealloc);
|
||||||
if (!prealloc) {
|
if (!prealloc) {
|
||||||
err = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
err = split_state(tree, state, prealloc, start);
|
ret = split_state(tree, state, prealloc, start);
|
||||||
if (err)
|
if (ret)
|
||||||
extent_io_tree_panic(tree, state, "split", err);
|
extent_io_tree_panic(tree, state, "split", ret);
|
||||||
prealloc = NULL;
|
prealloc = NULL;
|
||||||
if (err)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
if (state->end <= end) {
|
if (state->end <= end) {
|
||||||
set_state_bits(tree, state, bits, NULL);
|
set_state_bits(tree, state, bits, NULL);
|
||||||
@ -1442,7 +1442,7 @@ hit_next:
|
|||||||
|
|
||||||
prealloc = alloc_extent_state_atomic(prealloc);
|
prealloc = alloc_extent_state_atomic(prealloc);
|
||||||
if (!prealloc) {
|
if (!prealloc) {
|
||||||
err = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1454,8 +1454,8 @@ hit_next:
|
|||||||
prealloc->end = this_end;
|
prealloc->end = this_end;
|
||||||
inserted_state = insert_state(tree, prealloc, bits, NULL);
|
inserted_state = insert_state(tree, prealloc, bits, NULL);
|
||||||
if (IS_ERR(inserted_state)) {
|
if (IS_ERR(inserted_state)) {
|
||||||
err = PTR_ERR(inserted_state);
|
ret = PTR_ERR(inserted_state);
|
||||||
extent_io_tree_panic(tree, prealloc, "insert", err);
|
extent_io_tree_panic(tree, prealloc, "insert", ret);
|
||||||
}
|
}
|
||||||
cache_state(inserted_state, cached_state);
|
cache_state(inserted_state, cached_state);
|
||||||
if (inserted_state == prealloc)
|
if (inserted_state == prealloc)
|
||||||
@ -1472,13 +1472,13 @@ hit_next:
|
|||||||
if (state->start <= end && state->end > end) {
|
if (state->start <= end && state->end > end) {
|
||||||
prealloc = alloc_extent_state_atomic(prealloc);
|
prealloc = alloc_extent_state_atomic(prealloc);
|
||||||
if (!prealloc) {
|
if (!prealloc) {
|
||||||
err = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = split_state(tree, state, prealloc, end + 1);
|
ret = split_state(tree, state, prealloc, end + 1);
|
||||||
if (err)
|
if (ret)
|
||||||
extent_io_tree_panic(tree, state, "split", err);
|
extent_io_tree_panic(tree, state, "split", ret);
|
||||||
|
|
||||||
set_state_bits(tree, prealloc, bits, NULL);
|
set_state_bits(tree, prealloc, bits, NULL);
|
||||||
cache_state(prealloc, cached_state);
|
cache_state(prealloc, cached_state);
|
||||||
@ -1500,7 +1500,7 @@ out:
|
|||||||
if (prealloc)
|
if (prealloc)
|
||||||
free_extent_state(prealloc);
|
free_extent_state(prealloc);
|
||||||
|
|
||||||
return err;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user