|
@@ -462,8 +462,7 @@ void extent_io_tree_panic(struct extent_io_tree *tree, int err)
|
|
|
*
|
|
|
* the range [start, end] is inclusive.
|
|
|
*
|
|
|
- * This takes the tree lock, and returns < 0 on error, > 0 if any of the
|
|
|
- * bits were already set, or zero if none of the bits were already set.
|
|
|
+ * This takes the tree lock, and returns 0 on success and < 0 on error.
|
|
|
*/
|
|
|
int clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
|
|
|
int bits, int wake, int delete,
|
|
@@ -477,7 +476,6 @@ int clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
|
|
|
struct rb_node *node;
|
|
|
u64 last_end;
|
|
|
int err;
|
|
|
- int set = 0;
|
|
|
int clear = 0;
|
|
|
|
|
|
if (delete)
|
|
@@ -562,7 +560,7 @@ hit_next:
|
|
|
if (err)
|
|
|
goto out;
|
|
|
if (state->end <= end) {
|
|
|
- set |= clear_state_bit(tree, state, &bits, wake);
|
|
|
+ clear_state_bit(tree, state, &bits, wake);
|
|
|
if (last_end == (u64)-1)
|
|
|
goto out;
|
|
|
start = last_end + 1;
|
|
@@ -585,13 +583,13 @@ hit_next:
|
|
|
if (wake)
|
|
|
wake_up(&state->wq);
|
|
|
|
|
|
- set |= clear_state_bit(tree, prealloc, &bits, wake);
|
|
|
+ clear_state_bit(tree, prealloc, &bits, wake);
|
|
|
|
|
|
prealloc = NULL;
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
- set |= clear_state_bit(tree, state, &bits, wake);
|
|
|
+ clear_state_bit(tree, state, &bits, wake);
|
|
|
next:
|
|
|
if (last_end == (u64)-1)
|
|
|
goto out;
|
|
@@ -608,7 +606,7 @@ out:
|
|
|
if (prealloc)
|
|
|
free_extent_state(prealloc);
|
|
|
|
|
|
- return set;
|
|
|
+ return 0;
|
|
|
|
|
|
search_again:
|
|
|
if (start > end)
|