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

btrfs: Sink find_lock_delalloc_range's 'max_bytes' argument

Browse Source 
All callers of this function pass BTRFS_MAX_EXTENT_SIZE (128M) so let's
reduce the argument count and make that a local variable. No functional
changes.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2018-10-26 14:43:20 +03:00 committed by David Sterba
parent 64bc6c2a34
commit 917aacecc5
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/btrfs/extent_io.c
View File

@ -1559,8 +1559,9 @@ static noinline int lock_delalloc_pages(struct inode *inode,
static noinline_for_stack u64 find_lock_delalloc_range(struct inode *inode, static noinline_for_stack u64 find_lock_delalloc_range(struct inode *inode,
struct extent_io_tree *tree, struct extent_io_tree *tree,
struct page *locked_page, u64 *start, struct page *locked_page, u64 *start,
u64 *end, u64 max_bytes) u64 *end)
{ {
u64 max_bytes = BTRFS_MAX_EXTENT_SIZE;
u64 delalloc_start; u64 delalloc_start;
u64 delalloc_end; u64 delalloc_end;
u64 found; u64 found;
@ -1640,10 +1641,9 @@ out_failed:
u64 btrfs_find_lock_delalloc_range(struct inode *inode, u64 btrfs_find_lock_delalloc_range(struct inode *inode,
struct extent_io_tree *tree, struct extent_io_tree *tree,
struct page *locked_page, u64 *start, struct page *locked_page, u64 *start,
u64 *end, u64 max_bytes) u64 *end)
{ {
return find_lock_delalloc_range(inode, tree, locked_page, start, end, return find_lock_delalloc_range(inode, tree, locked_page, start, end);
max_bytes);
} }
#endif #endif
@ -3217,8 +3217,7 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode,
nr_delalloc = find_lock_delalloc_range(inode, tree, nr_delalloc = find_lock_delalloc_range(inode, tree,
page, page,
&delalloc_start, &delalloc_start,
&delalloc_end, &delalloc_end);
BTRFS_MAX_EXTENT_SIZE);
if (nr_delalloc == 0) { if (nr_delalloc == 0) {
delalloc_start = delalloc_end + 1; delalloc_start = delalloc_end + 1;
continue; continue;

2
fs/btrfs/extent_io.h
View File

@ -525,7 +525,7 @@ int free_io_failure(struct extent_io_tree *failure_tree,
u64 btrfs_find_lock_delalloc_range(struct inode *inode, u64 btrfs_find_lock_delalloc_range(struct inode *inode,
struct extent_io_tree *tree, struct extent_io_tree *tree,
struct page *locked_page, u64 *start, struct page *locked_page, u64 *start,
u64 *end, u64 max_bytes); u64 *end);
#endif #endif
struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info,
u64 start); u64 start);

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

@ -108,7 +108,7 @@ static int test_find_delalloc(u32 sectorsize)
start = 0; start = 0;
end = 0; end = 0;
found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start, found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start,
&end, max_bytes); &end);
if (!found) { if (!found) {
test_err("should have found at least one delalloc"); test_err("should have found at least one delalloc");
goto out_bits; goto out_bits;
@ -139,7 +139,7 @@ static int test_find_delalloc(u32 sectorsize)
start = test_start; start = test_start;
end = 0; end = 0;
found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start, found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start,
&end, max_bytes); &end);
if (!found) { if (!found) {
test_err("couldn't find delalloc in our range"); test_err("couldn't find delalloc in our range");
goto out_bits; goto out_bits;
@ -173,7 +173,7 @@ static int test_find_delalloc(u32 sectorsize)
start = test_start; start = test_start;
end = 0; end = 0;
found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start, found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start,
&end, max_bytes); &end);
if (found) { if (found) {
test_err("found range when we shouldn't have"); test_err("found range when we shouldn't have");
goto out_bits; goto out_bits;
@ -194,7 +194,7 @@ static int test_find_delalloc(u32 sectorsize)
start = test_start; start = test_start;
end = 0; end = 0;
found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start, found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start,
&end, max_bytes); &end);
if (!found) { if (!found) {
test_err("didn't find our range"); test_err("didn't find our range");
goto out_bits; goto out_bits;
@ -235,7 +235,7 @@ static int test_find_delalloc(u32 sectorsize)
* tests expected behavior. * tests expected behavior.
*/ */
found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start, found = btrfs_find_lock_delalloc_range(inode, &tmp, locked_page, &start,
&end, max_bytes); &end);
if (!found) { if (!found) {
test_err("didn't find our range"); test_err("didn't find our range");
goto out_bits; goto out_bits;