On 29.11.18 г. 5:33 ч., Lu Fengqi wrote:
> The @found is always false when it comes to the if branch. Besides, the
> bool type is more suitable for @found. Change the return value of the
> function and its caller to bool as well.
>
> Signed-off-by: Lu Fengqi <lufq.fnst@xxxxxxxxxxxxxx>
Reviewed-by: Nikolay Borisov <nborisov@xxxxxxxx>
> ---
> fs/btrfs/extent_io.c | 31 +++++++++++++++----------------
> fs/btrfs/extent_io.h | 2 +-
> fs/btrfs/tests/extent-io-tests.c | 2 +-
> 3 files changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index b2769e92b556..4b6b87e63b4a 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -1452,16 +1452,16 @@ int find_first_extent_bit(struct extent_io_tree *tree, u64 start,
> * find a contiguous range of bytes in the file marked as delalloc, not
> * more than 'max_bytes'. start and end are used to return the range,
> *
> - * 1 is returned if we find something, 0 if nothing was in the tree
> + * true is returned if we find something, false if nothing was in the tree
> */
> -static noinline u64 find_delalloc_range(struct extent_io_tree *tree,
> +static noinline bool find_delalloc_range(struct extent_io_tree *tree,
> u64 *start, u64 *end, u64 max_bytes,
> struct extent_state **cached_state)
> {
> struct rb_node *node;
> struct extent_state *state;
> u64 cur_start = *start;
> - u64 found = 0;
> + bool found = false;
> u64 total_bytes = 0;
>
> spin_lock(&tree->lock);
> @@ -1472,8 +1472,7 @@ static noinline u64 find_delalloc_range(struct extent_io_tree *tree,
> */
> node = tree_search(tree, cur_start);
> if (!node) {
> - if (!found)
> - *end = (u64)-1;
> + *end = (u64)-1;
> goto out;
> }
>
> @@ -1493,7 +1492,7 @@ static noinline u64 find_delalloc_range(struct extent_io_tree *tree,
> *cached_state = state;
> refcount_inc(&state->refs);
> }
> - found++;
> + found = true;
> *end = state->end;
> cur_start = state->end + 1;
> node = rb_next(node);
> @@ -1551,13 +1550,13 @@ static noinline int lock_delalloc_pages(struct inode *inode,
> }
>
> /*
> - * find a contiguous range of bytes in the file marked as delalloc, not
> - * more than 'max_bytes'. start and end are used to return the range,
> + * find and lock a contiguous range of bytes in the file marked as delalloc,
> + * not more than 'max_bytes'. start and end are used to return the range,
> *
> - * 1 is returned if we find something, 0 if nothing was in the tree
> + * true is returned if we find something, false if nothing was in the tree
> */
> EXPORT_FOR_TESTS
> -noinline_for_stack u64 find_lock_delalloc_range(struct inode *inode,
> +noinline_for_stack bool find_lock_delalloc_range(struct inode *inode,
> struct extent_io_tree *tree,
> struct page *locked_page, u64 *start,
> u64 *end)
> @@ -1565,7 +1564,7 @@ noinline_for_stack u64 find_lock_delalloc_range(struct inode *inode,
> u64 max_bytes = BTRFS_MAX_EXTENT_SIZE;
> u64 delalloc_start;
> u64 delalloc_end;
> - u64 found;
> + bool found;
> struct extent_state *cached_state = NULL;
> int ret;
> int loops = 0;
> @@ -1580,7 +1579,7 @@ noinline_for_stack u64 find_lock_delalloc_range(struct inode *inode,
> *start = delalloc_start;
> *end = delalloc_end;
> free_extent_state(cached_state);
> - return 0;
> + return false;
> }
>
> /*
> @@ -1612,7 +1611,7 @@ noinline_for_stack u64 find_lock_delalloc_range(struct inode *inode,
> loops = 1;
> goto again;
> } else {
> - found = 0;
> + found = false;
> goto out_failed;
> }
> }
> @@ -3195,7 +3194,7 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode,
> {
> struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;
> u64 page_end = delalloc_start + PAGE_SIZE - 1;
> - u64 nr_delalloc;
> + bool found;
> u64 delalloc_to_write = 0;
> u64 delalloc_end = 0;
> int ret;
> @@ -3203,11 +3202,11 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode,
>
>
> while (delalloc_end < page_end) {
> - nr_delalloc = find_lock_delalloc_range(inode, tree,
> + found = find_lock_delalloc_range(inode, tree,
> page,
> &delalloc_start,
> &delalloc_end);
> - if (nr_delalloc == 0) {
> + if (!found) {
> delalloc_start = delalloc_end + 1;
> continue;
> }
> diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
> index a1d3ea5a0d32..67881bca15fe 100644
> --- a/fs/btrfs/extent_io.h
> +++ b/fs/btrfs/extent_io.h
> @@ -521,7 +521,7 @@ int free_io_failure(struct extent_io_tree *failure_tree,
> struct extent_io_tree *io_tree,
> struct io_failure_record *rec);
> #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
> -u64 find_lock_delalloc_range(struct inode *inode, struct extent_io_tree *tree,
> +bool find_lock_delalloc_range(struct inode *inode, struct extent_io_tree *tree,
> struct page *locked_page, u64 *start,
> u64 *end);
> #endif
> diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
> index d33f9a95bce1..3c46d7f23456 100644
> --- a/fs/btrfs/tests/extent-io-tests.c
> +++ b/fs/btrfs/tests/extent-io-tests.c
> @@ -66,7 +66,7 @@ static int test_find_delalloc(u32 sectorsize)
> u64 max_bytes = BTRFS_MAX_EXTENT_SIZE;
> u64 total_dirty = 2 * max_bytes;
> u64 start, end, test_start;
> - u64 found;
> + bool found;
> int ret = -EINVAL;
>
> test_msg("running find delalloc tests");
>
