AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-19 01:16:34 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

btrfs: remove always true if branch in find_delalloc_range

Browse Source 
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.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Lu Fengqi 2018-11-29 11:33:38 +08:00 committed by David Sterba
parent 27a7ff554e
commit 3522e90301
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fs/btrfs/extent_io.c
View File

@ -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,14 @@ 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, no
* 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
* Return: true 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 +1565,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 +1580,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 +1612,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 +3195,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 +3203,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;
}

2
fs/btrfs/extent_io.h
View File

@ -525,7 +525,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

2
fs/btrfs/tests/extent-io-tests.c
View File

@ -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");