btrfs: fix arguments to btrfs_wait_on_page_writeback_range
PATCH 1/2 btrfs: fix arguments to btrfs_wait_on_page_writeback_range
wait_on_page_writeback_range/btrfs_wait_on_page_writeback_range takes a pagecache offset, not a byte offset into the file. Shift the arguments around to wait for the correct range
Signed-off-by Christoph Hellwig <[email protected]>
fs/btrfs/disk-io.c +3 -1
@@ -829,7 +829,9 @@ int btrfs_write_tree_block(struct extentint btrfs_wait_tree_block_writeback (struct extent_buffer *buf) {return btrfs_wait_on_page_writeback_range (buf->first_page->mapping, - buf->start, buf->start + buf->len -1 ); + buf->start >>PAGE_CACHE_SHIFT , + (buf->start + buf->len -1 ) >> +PAGE_CACHE_SHIFT ); } struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
PATCH 2/2 btrfs: remove duplicates of filemap_ helpers
Use filemap_fdatawrite_range and filemap_fdatawait_range instead of local copies of the functions. For filemap_fdatawait_range that also means replacing the awkward old wait_on_page_writeback_range calling convention with the regular filemap byte offsets.
Signed-off-by Christoph Hellwig <[email protected]>
fs/btrfs/disk-io.c +4 -6
@@ -822,16 +822,14 @@ struct extent_buffer *btrfs_find_create_int btrfs_write_tree_block (struct extent_buffer *buf) { -return btrfs_fdatawrite_range (buf->first_page->mapping, buf->start, - buf->start + buf->len -1 ,WB_SYNC_ALL ); +return filemap_fdatawrite_range (buf->first_page->mapping, buf->start, + buf->start + buf->len -1 ); }int btrfs_wait_tree_block_writeback (struct extent_buffer *buf) { -return btrfs_wait_on_page_writeback_range (buf->first_page->mapping, - buf->start >>PAGE_CACHE_SHIFT , - (buf->start + buf->len -1 ) >> -PAGE_CACHE_SHIFT ); +return filemap_fdatawait_range (buf->first_page->mapping, + buf->start, buf->start + buf->len -1 ); } struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
fs/btrfs/ordered-data.c +4 -89
117 lines not on this page · raw message
fs/btrfs/ordered-data.h +0 -4
@@ -153,10 +153,6 @@ btrfs_lookup_first_ordered_extent(structint btrfs_ordered_update_i_size (struct inode *inode,struct btrfs_ordered_extent *ordered);int btrfs_find_ordered_sum (struct inode *inode,u64 offset,u64 disk_bytenr,u32 *sum); -int btrfs_wait_on_page_writeback_range (struct address_space *mapping, -pgoff_t start,pgoff_t end); -int btrfs_fdatawrite_range (struct address_space *mapping,loff_t start, -loff_t end,int sync_mode);int btrfs_wait_ordered_extents (struct btrfs_root *root,int nocow_only);int btrfs_run_ordered_operations (struct btrfs_root *root,int wait); int btrfs_add_ordered_operation(struct btrfs_trans_handle *trans,
fs/btrfs/file.c +2 -3
@@ -1005,9 +1005,8 @@ static ssize_t btrfs_file_write(struct f }if (will_write) { -btrfs_fdatawrite_range (inode->i_mapping, pos, - pos + write_bytes -1 , -WB_SYNC_ALL ); +filemap_fdatawrite_range (inode->i_mapping, pos, + pos + write_bytes -1 ); }else {balance_dirty_pages_ratelimited_nr (inode->i_mapping, num_pages);