On 19.06.19 г. 3:35 ч., Goldwyn Rodrigues wrote:
> Simplification.
> No point passing the tree variable when it can be evaluated
> from inode.
>
> Signed-off-by: Goldwyn Rodrigues <rgoldwyn@xxxxxxxx>
The patch is good, however, there are several calls to find_
lock_delalloc_range in btrfs tests so you'd need to fix those
invocations, otherwise compilation of the in-kernel test suite will fails.
fs/btrfs/tests/extent-io-tests.c: found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
fs/btrfs/tests/extent-io-tests.c: found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
fs/btrfs/tests/extent-io-tests.c: found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
fs/btrfs/tests/extent-io-tests.c: found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
fs/btrfs/tests/extent-io-tests.c: found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
> ---
> fs/btrfs/extent_io.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index db337e53aab3..e9475d7e11bf 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -1719,10 +1719,10 @@ static noinline int lock_delalloc_pages(struct inode *inode,
> */
> EXPORT_FOR_TESTS
> noinline_for_stack bool find_lock_delalloc_range(struct inode *inode,
> - struct extent_io_tree *tree,
> struct page *locked_page, u64 *start,
> u64 *end)
> {
> + struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;
> u64 max_bytes = BTRFS_MAX_EXTENT_SIZE;
> u64 delalloc_start;
> u64 delalloc_end;
> @@ -3290,7 +3290,6 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode,
> struct page *page, struct writeback_control *wbc,
> u64 delalloc_start, unsigned long *nr_written)
> {
> - struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;
> u64 page_end = delalloc_start + PAGE_SIZE - 1;
> bool found;
> u64 delalloc_to_write = 0;
> @@ -3300,8 +3299,7 @@ static noinline_for_stack int writepage_delalloc(struct inode *inode,
>
>
> while (delalloc_end < page_end) {
> - found = find_lock_delalloc_range(inode, tree,
> - page,
> + found = find_lock_delalloc_range(inode, page,
> &delalloc_start,
> &delalloc_end);
> if (!found) {
>
