btrfs: remove btrfs_writepage_endio_finish_ordered
PATCH 1/2 btrfs: remove btrfs_writepage_endio_finish_ordered
btrfs_writepage_endio_finish_ordered is a small wrapper around btrfs_mark_ordered_io_finished that just changs the argument passing slightly, and adds a tracepoint.
Move the tracpoint to btrfs_mark_ordered_io_finished, which means it now also covers the error handling in btrfs_cleanup_ordered_extent and switch all callers to just call btrfs_mark_ordered_io_finished directly.
--- fs/btrfs/btrfs_inode.h | 3 --- fs/btrfs/extent_io.c | 17 ++++++++--------- fs/btrfs/inode.c | 9 --------- fs/btrfs/ordered-data.c | 4 ++++ 4 files changed, 12 insertions(+), 21 deletions(-)
fs/btrfs/btrfs_inode.h +0 -3
@@ -501,9 +501,6 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct page *locked_page u64 start, u64 end, int *page_started, unsigned long *nr_written, struct writeback_control *wbc);int btrfs_writepage_cow_fixup (struct page *page); -void btrfs_writepage_endio_finish_ordered (struct btrfs_inode *inode, -struct page *page,u64 start, -u64 end,bool uptodate);int btrfs_encoded_io_compression_from_extent (struct btrfs_fs_info *fs_info,int compress_type); int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,
fs/btrfs/extent_io.c +8 -9
@@ -473,17 +473,15 @@ void end_extent_writepage(struct page *page, int err, u64 start, u64 end)struct btrfs_inode *inode;const bool uptodate = (err ==0 );int ret =0 ; +u32 len = end +1 - start; +ASSERT (end +1 - start <=U32_MAX );ASSERT (page && page->mapping); inode =BTRFS_I (page->mapping->host); -btrfs_writepage_endio_finish_ordered (inode, page, start, end, uptodate); +btrfs_mark_ordered_io_finished (inode, page, start, len, uptodate);if (!uptodate) {const struct btrfs_fs_info *fs_info = inode->root->fs_info; -u32 len; - -ASSERT (end +1 - start <=U32_MAX ); - len = end +1 - start;btrfs_page_clear_uptodate (fs_info, page, start, len); ret = err <0 ? err : -EIO ;
@@ -1328,6 +1326,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode, bio_ctrl->end_io_func = end_bio_extent_writepage;while (cur <= end) { +u32 len = end - cur +1 ;u64 disk_bytenr;u64 em_end;u64 dirty_range_start = cur;
@@ -1335,8 +1334,8 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,u32 iosize;if (cur >= i_size) { -btrfs_writepage_endio_finish_ordered (inode, page, cur, - end, true); +btrfs_mark_ordered_io_finished (inode, page, cur, len, + true);/* * This range is beyond i_size, thus we don't need to * bother writing back.
@@ -1345,7 +1344,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,* writeback the sectors with subpage dirty bits, * causing writeback without ordered extent. */ -btrfs_page_clear_dirty (fs_info, page, cur, end +1 - cur); +btrfs_page_clear_dirty (fs_info, page, cur, len);break ; }
@@ -1356,7 +1355,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,continue ; } - em =btrfs_get_extent (inode,NULL ,0 , cur, end - cur +1 ); + em =btrfs_get_extent (inode,NULL ,0 , cur, len);if (IS_ERR (em)) { ret =PTR_ERR_OR_ZERO (em); goto out_error;
fs/btrfs/inode.c +0 -9
@@ -3384,15 +3384,6 @@ int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered)return btrfs_finish_one_ordered (ordered); } -void btrfs_writepage_endio_finish_ordered (struct btrfs_inode *inode, -struct page *page,u64 start, -u64 end,bool uptodate) -{ -trace_btrfs_writepage_end_io_hook (inode, start, end, uptodate); - -btrfs_mark_ordered_io_finished (inode, page, start, end +1 - start, uptodate); -} -/* * Verify the checksum for a single sector without any extra action that depend * on the type of I/O.
fs/btrfs/ordered-data.c +4 -0
@@ -410,6 +410,10 @@ void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode,unsigned long flags;u64 cur = file_offset; +trace_btrfs_writepage_end_io_hook (inode, file_offset, + file_offset + num_bytes -1 , + uptodate); +spin_lock_irqsave (&tree->lock, flags);while (cur < file_offset + num_bytes) {u64 entry_end;
Signature · 1 line
2.39.2
PATCH 2/2 btrfs: remove end_extent_writepage
end_extent_writepage is a small helper that combines a call to btrfs_mark_ordered_io_finished with conditional error-only calls to btrfs_page_clear_uptodate and mapping_set_error with a somewhat unfortunate calling convention that passes and inclusive end instead of the len expected by the underlying functions.
Remove end_extent_writepage and open code it in the 4 callers. Out of those two already are error-only and thus don't need the extra conditional, and one already has the mapping_set_error, so a duplicate call can be avoided.
--- fs/btrfs/extent_io.c | 44 +++++++++++++++----------------------------- fs/btrfs/extent_io.h | 2 -- fs/btrfs/inode.c | 42 ++++++++++++++++++++++-------------------- 3 files changed, 37 insertions(+), 51 deletions(-)
fs/btrfs/extent_io.c +15 -29
@@ -466,29 +466,6 @@ static void end_page_read(struct page *page, bool uptodate, u64 start, u32 len)btrfs_subpage_end_reader (fs_info, page, start, len); } -/* lots and lots of room for performance fixes in the end_bio funcs */ - -void end_extent_writepage (struct page *page,int err,u64 start,u64 end) -{ -struct btrfs_inode *inode; -const bool uptodate = (err ==0 ); -int ret =0 ; -u32 len = end +1 - start; - -ASSERT (end +1 - start <=U32_MAX ); -ASSERT (page && page->mapping); - inode =BTRFS_I (page->mapping->host); -btrfs_mark_ordered_io_finished (inode, page, start, len, uptodate); - -if (!uptodate) { -const struct btrfs_fs_info *fs_info = inode->root->fs_info; - -btrfs_page_clear_uptodate (fs_info, page, start, len); - ret = err <0 ? err : -EIO ; -mapping_set_error (page->mapping, ret); - } -} -/* * after a writepage IO is done, we need to: * clear the uptodate bits on error
@@ -1431,7 +1408,6 @@ static int __extent_writepage(struct page *page, struct btrfs_bio_ctrl *bio_ctrlstruct folio *folio =page_folio (page);struct inode *inode = page->mapping->host;const u64 page_start =page_offset (page); -const u64 page_end = page_start +PAGE_SIZE -1 ;int ret;int nr =0 ;size_t pg_offset;
@@ -1475,8 +1451,13 @@ static int __extent_writepage(struct page *page, struct btrfs_bio_ctrl *bio_ctrlset_page_writeback (page);end_page_writeback (page); } -if (ret) -end_extent_writepage (page, ret, page_start, page_end); +if (ret) { +btrfs_mark_ordered_io_finished (BTRFS_I (inode), page, page_start, +PAGE_SIZE , !ret); +btrfs_page_clear_uptodate (btrfs_sb (inode->i_sb), page, + page_start,PAGE_SIZE ); +mapping_set_error (page->mapping, ret); + }unlock_page (page);ASSERT (ret <=0 );return ret;
@@ -2194,6 +2175,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,while (cur <= end) {u64 cur_end =min (round_down (cur,PAGE_SIZE ) +PAGE_SIZE -1 , end); +u32 cur_len = cur_end +1 - cur;struct page *page;int nr =0 ;
@@ -2217,9 +2199,13 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,set_page_writeback (page);end_page_writeback (page); } -if (ret) -end_extent_writepage (page, ret, cur, cur_end); -btrfs_page_unlock_writer (fs_info, page, cur, cur_end +1 - cur); +if (ret) { +btrfs_mark_ordered_io_finished (BTRFS_I (inode), page, + cur, cur_len, !ret); +btrfs_page_clear_uptodate (fs_info, page, cur, cur_len); +mapping_set_error (page->mapping, ret); + } +btrfs_page_unlock_writer (fs_info, page, cur, cur_len);if (ret <0 ) { found_error = true; first_error = ret;
fs/btrfs/extent_io.h +0 -2
@@ -276,8 +276,6 @@ void btrfs_clear_buffer_dirty(struct btrfs_trans_handle *trans,int btrfs_alloc_page_array (unsigned int nr_pages,struct page **page_array); -void end_extent_writepage (struct page *page,int err,u64 start,u64 end); -#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS bool find_lock_delalloc_range(struct inode *inode, struct page *locked_page, u64 *start,
fs/btrfs/inode.c +22 -20
77 lines not on this page · raw message
Signature · 1 line
2.39.2
Quoted 10 lines · Christoph Hellwig
btrfs_writepage_endio_finish_orderedis a small wrapper aroundbtrfs_mark_ordered_io_finishedthat just changs the argument passing slightly, and adds a tracepoint.Move the tracpoint to
btrfs_mark_ordered_io_finished, which means it now also covers the error handling inbtrfs_cleanup_ordered_extentand switch all callers to just callbtrfs_mark_ordered_io_finisheddirectly.Signed-off-by Christoph Hellwig <[email protected]>
FYI, for now cleanups or refactoring that do not seem to be necessary for some other fix will be postponed after rc1. I'm replying here but it's meant for other patches.