On 21.03.19 г. 21:21 ч., David Sterba wrote:
> The wrapper names better describe what's happening so they're not
> deleted though they're trivial, but at least moved closer to their place
> of use.
>
> Signed-off-by: David Sterba <dste...@suse.com>
Reviewed-by: Nikolay Borisov <nbori...@suse.com>
> ---
> fs/btrfs/disk-io.c | 13 -------------
> fs/btrfs/disk-io.h | 2 --
> fs/btrfs/tree-log.c | 11 +++++++++++
> 3 files changed, 11 insertions(+), 15 deletions(-)
>
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index 5216e7b3f9ad..8329041e1c72 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -1067,19 +1067,6 @@ struct extent_buffer *btrfs_find_create_tree_block(
> return alloc_extent_buffer(fs_info, bytenr);
> }
>
> -
> -int btrfs_write_tree_block(struct extent_buffer *buf)
> -{
> - return filemap_fdatawrite_range(buf->pages[0]->mapping, buf->start,
> - buf->start + buf->len - 1);
> -}
> -
> -void btrfs_wait_tree_block_writeback(struct extent_buffer *buf)
> -{
> - filemap_fdatawait_range(buf->pages[0]->mapping,
> - buf->start, buf->start + buf->len - 1);
> -}
> -
> /*
> * Read tree block at logical address @bytenr and do variant basic but
> critical
> * verification.
> diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
> index 987a64bc0c66..0a893008d4f6 100644
> --- a/fs/btrfs/disk-io.h
> +++ b/fs/btrfs/disk-io.h
> @@ -123,8 +123,6 @@ blk_status_t btrfs_wq_submit_bio(struct btrfs_fs_info
> *fs_info, struct bio *bio,
> extent_submit_bio_start_t *submit_bio_start);
> blk_status_t btrfs_submit_bio_done(void *private_data, struct bio *bio,
> int mirror_num);
> -int btrfs_write_tree_block(struct extent_buffer *buf);
> -void btrfs_wait_tree_block_writeback(struct extent_buffer *buf);
> int btrfs_init_log_root_tree(struct btrfs_trans_handle *trans,
> struct btrfs_fs_info *fs_info);
> int btrfs_add_log_tree(struct btrfs_trans_handle *trans,
> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
> index f06454a55e00..395f03db232d 100644
> --- a/fs/btrfs/tree-log.c
> +++ b/fs/btrfs/tree-log.c
> @@ -225,6 +225,17 @@ void btrfs_end_log_trans(struct btrfs_root *root)
> }
> }
>
> +static int btrfs_write_tree_block(struct extent_buffer *buf)
> +{
> + return filemap_fdatawrite_range(buf->pages[0]->mapping, buf->start,
> + buf->start + buf->len - 1);
> +}
> +
> +static void btrfs_wait_tree_block_writeback(struct extent_buffer *buf)
> +{
> + filemap_fdatawait_range(buf->pages[0]->mapping,
> + buf->start, buf->start + buf->len - 1);
> +}
>
> /*
> * the walk control struct is used to pass state down the chain when
>
