On Fri, Oct 06, 2017 at 02:29:58PM +0200, David Sterba wrote:
> We're going to remove sector_t and will use 'offset', so this patch
> frees the name.
>
> Signed-off-by: David Sterba <dsterba@xxxxxxxx>
> ---
> fs/btrfs/extent_io.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index 12ab19a4b93e..ea9ab934794b 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -2762,7 +2762,7 @@ static int merge_bio(struct extent_io_tree *tree, struct page *page,
> static int submit_extent_page(unsigned int opf, struct extent_io_tree *tree,
> struct writeback_control *wbc,
> struct page *page, sector_t sector,
> - size_t size, unsigned long offset,
> + size_t size, unsigned long pg_offset,
> struct block_device *bdev,
> struct bio **bio_ret,
> bio_end_io_t end_io_func,
> @@ -2786,8 +2786,8 @@ static int submit_extent_page(unsigned int opf, struct extent_io_tree *tree,
>
> if (prev_bio_flags != bio_flags || !contig ||
> force_bio_submit ||
> - merge_bio(tree, page, offset, page_size, bio, bio_flags) ||
> - bio_add_page(bio, page, page_size, offset) < page_size) {
> + merge_bio(tree, page, pg_offset, page_size, bio, bio_flags) ||
> + bio_add_page(bio, page, page_size, pg_offset) < page_size) {
> ret = submit_one_bio(bio, mirror_num, prev_bio_flags);
> if (ret < 0) {
> *bio_ret = NULL;
> @@ -2802,7 +2802,7 @@ static int submit_extent_page(unsigned int opf, struct extent_io_tree *tree,
> }
>
> bio = btrfs_bio_alloc(bdev, sector << 9);
> - bio_add_page(bio, page, page_size, offset);
> + bio_add_page(bio, page, page_size, pg_offset);
> bio->bi_end_io = end_io_func;
> bio->bi_private = tree;
> bio->bi_write_hint = page->mapping->host->i_write_hint;
Reviewed-by: Liu Bo <bo.li.liu@xxxxxxxxxx>
-liubo
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
