Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a9b0e53 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: sink extent_write_full_page tree argument 



The tree argument passed to extent_write_full_page is referenced from
the page being passed to the same function. Since we already have
enough information to get the reference, remove the function parameter.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5e3ee236

fs/btrfs/extent_io.c

+2 −3
Original line number Diff line number Diff line
@@ -4056,13 +4056,12 @@ static noinline void flush_write_bio(void *data) 
	flush_epd_write_bio(epd);

}



int extent_write_full_page(struct extent_io_tree *tree, struct page *page,

			  struct writeback_control *wbc)

int extent_write_full_page(struct page *page, struct writeback_control *wbc)

{

	int ret;

	struct extent_page_data epd = {

		.bio = NULL,

		.tree = tree,

		.tree = &BTRFS_I(page->mapping->host)->io_tree,

		.extent_locked = 0,

		.sync_io = wbc->sync_mode == WB_SYNC_ALL,

	};

fs/btrfs/extent_io.h

+1 −2
Original line number Diff line number Diff line
@@ -403,8 +403,7 @@ int find_first_extent_bit(struct extent_io_tree *tree, u64 start, 
			  struct extent_state **cached_state);

int extent_invalidatepage(struct extent_io_tree *tree,

			  struct page *page, unsigned long offset);

int extent_write_full_page(struct extent_io_tree *tree, struct page *page,

			  struct writeback_control *wbc);

int extent_write_full_page(struct page *page, struct writeback_control *wbc);

int extent_write_locked_range(struct inode *inode, u64 start, u64 end,

			      int mode);

int extent_writepages(struct extent_io_tree *tree,

fs/btrfs/inode.c

+1 −3
Original line number Diff line number Diff line
@@ -8855,7 +8855,6 @@ int btrfs_readpage(struct file *file, struct page *page) 


static int btrfs_writepage(struct page *page, struct writeback_control *wbc)

{

	struct extent_io_tree *tree;

	struct inode *inode = page->mapping->host;

	int ret;
@@ -8874,8 +8873,7 @@ static int btrfs_writepage(struct page *page, struct writeback_control *wbc) 
		redirty_page_for_writepage(wbc, page);

		return AOP_WRITEPAGE_ACTIVATE;

	}

	tree = &BTRFS_I(page->mapping->host)->io_tree;

	ret = extent_write_full_page(tree, page, wbc);

	ret = extent_write_full_page(page, wbc);

	btrfs_add_delayed_iput(inode);

	return ret;

}