Commit c629732d authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

btrfs: Remove unused extent_state argument from btrfs_writepage_endio_finish_ordered

This parameter was never used, yet was part of the interface of the
function ever since its introduction as extent_io_ops::writepage_end_io_hook
in e6dcd2dc ("Btrfs: New data=ordered implementation"). Now that
NULL is passed everywhere as a value for this parameter let's remove it
for good. No functional changes.
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 8cc0237a
...@@ -249,7 +249,7 @@ static void end_compressed_bio_write(struct bio *bio) ...@@ -249,7 +249,7 @@ static void end_compressed_bio_write(struct bio *bio)
inode = cb->inode; inode = cb->inode;
cb->compressed_pages[0]->mapping = cb->inode->i_mapping; cb->compressed_pages[0]->mapping = cb->inode->i_mapping;
btrfs_writepage_endio_finish_ordered(cb->compressed_pages[0], btrfs_writepage_endio_finish_ordered(cb->compressed_pages[0],
cb->start, cb->start + cb->len - 1, NULL, cb->start, cb->start + cb->len - 1,
bio->bi_status ? BLK_STS_OK : BLK_STS_NOTSUPP); bio->bi_status ? BLK_STS_OK : BLK_STS_NOTSUPP);
cb->compressed_pages[0]->mapping = NULL; cb->compressed_pages[0]->mapping = NULL;
......
...@@ -3179,7 +3179,7 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, ...@@ -3179,7 +3179,7 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
struct btrfs_root *new_root, struct btrfs_root *new_root,
struct btrfs_root *parent_root, struct btrfs_root *parent_root,
u64 new_dirid); u64 new_dirid);
void btrfs_set_delalloc_extent(struct inode *inode, struct extent_state *state, void btrfs_set_delalloc_extent(struct inode *inode, struct extent_state *state,
unsigned *bits); unsigned *bits);
void btrfs_clear_delalloc_extent(struct inode *inode, void btrfs_clear_delalloc_extent(struct inode *inode,
struct extent_state *state, unsigned *bits); struct extent_state *state, unsigned *bits);
...@@ -3231,7 +3231,7 @@ int btrfs_run_delalloc_range(void *private_data, struct page *locked_page, ...@@ -3231,7 +3231,7 @@ int btrfs_run_delalloc_range(void *private_data, struct page *locked_page,
struct writeback_control *wbc); struct writeback_control *wbc);
int btrfs_writepage_cow_fixup(struct page *page, u64 start, u64 end); int btrfs_writepage_cow_fixup(struct page *page, u64 start, u64 end);
void btrfs_writepage_endio_finish_ordered(struct page *page, u64 start, void btrfs_writepage_endio_finish_ordered(struct page *page, u64 start,
u64 end, struct extent_state *state, int uptodate); u64 end, int uptodate);
extern const struct dentry_operations btrfs_dentry_operations; extern const struct dentry_operations btrfs_dentry_operations;
/* ioctl.c */ /* ioctl.c */
......
...@@ -2407,7 +2407,7 @@ void end_extent_writepage(struct page *page, int err, u64 start, u64 end) ...@@ -2407,7 +2407,7 @@ void end_extent_writepage(struct page *page, int err, u64 start, u64 end)
int uptodate = (err == 0); int uptodate = (err == 0);
int ret = 0; int ret = 0;
btrfs_writepage_endio_finish_ordered(page, start, end, NULL, uptodate); btrfs_writepage_endio_finish_ordered(page, start, end, uptodate);
if (!uptodate) { if (!uptodate) {
ClearPageUptodate(page); ClearPageUptodate(page);
...@@ -3326,8 +3326,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, ...@@ -3326,8 +3326,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
end = page_end; end = page_end;
if (i_size <= start) { if (i_size <= start) {
btrfs_writepage_endio_finish_ordered(page, start, page_end, btrfs_writepage_endio_finish_ordered(page, start, page_end, 1);
NULL, 1);
goto done; goto done;
} }
...@@ -3339,7 +3338,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, ...@@ -3339,7 +3338,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
if (cur >= i_size) { if (cur >= i_size) {
btrfs_writepage_endio_finish_ordered(page, cur, btrfs_writepage_endio_finish_ordered(page, cur,
page_end, NULL, 1); page_end, 1);
break; break;
} }
em = btrfs_get_extent(BTRFS_I(inode), page, pg_offset, cur, em = btrfs_get_extent(BTRFS_I(inode), page, pg_offset, cur,
...@@ -3376,7 +3375,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, ...@@ -3376,7 +3375,7 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
if (!compressed) if (!compressed)
btrfs_writepage_endio_finish_ordered(page, cur, btrfs_writepage_endio_finish_ordered(page, cur,
cur + iosize - 1, cur + iosize - 1,
NULL, 1); 1);
else if (compressed) { else if (compressed) {
/* we don't want to end_page_writeback on /* we don't want to end_page_writeback on
* a compressed extent. this happens * a compressed extent. this happens
...@@ -4063,8 +4062,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end, ...@@ -4063,8 +4062,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
ret = __extent_writepage(page, &wbc_writepages, &epd); ret = __extent_writepage(page, &wbc_writepages, &epd);
else { else {
btrfs_writepage_endio_finish_ordered(page, start, btrfs_writepage_endio_finish_ordered(page, start,
start + PAGE_SIZE - 1, start + PAGE_SIZE - 1, 1);
NULL, 1);
unlock_page(page); unlock_page(page);
} }
put_page(page); put_page(page);
......
...@@ -853,8 +853,7 @@ static noinline void submit_compressed_extents(struct inode *inode, ...@@ -853,8 +853,7 @@ static noinline void submit_compressed_extents(struct inode *inode,
const u64 end = start + async_extent->ram_size - 1; const u64 end = start + async_extent->ram_size - 1;
p->mapping = inode->i_mapping; p->mapping = inode->i_mapping;
btrfs_writepage_endio_finish_ordered(p, start, end, btrfs_writepage_endio_finish_ordered(p, start, end, 0);
NULL, 0);
p->mapping = NULL; p->mapping = NULL;
extent_clear_unlock_delalloc(inode, start, end, end, extent_clear_unlock_delalloc(inode, start, end, end,
...@@ -3153,8 +3152,8 @@ static void finish_ordered_fn(struct btrfs_work *work) ...@@ -3153,8 +3152,8 @@ static void finish_ordered_fn(struct btrfs_work *work)
btrfs_finish_ordered_io(ordered_extent); btrfs_finish_ordered_io(ordered_extent);
} }
void btrfs_writepage_endio_finish_ordered(struct page *page, u64 start, u64 end, void btrfs_writepage_endio_finish_ordered(struct page *page, u64 start,
struct extent_state *state, int uptodate) u64 end, int uptodate)
{ {
struct inode *inode = page->mapping->host; struct inode *inode = page->mapping->host;
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment