Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eee4fa4 authored by Miao Xie's avatar Miao Xie Committed by Josef Bacik
Browse files

Btrfs: use wrapper page_offset 



Use wrapper page_offset to get byte-offset into filesystem object for page.

Signed-off-by: default avatarLiu Bo <liubo2009@cn.fujitsu.com>
Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent da633a42

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root, 
static int csum_dirty_buffer(struct btrfs_root *root, struct page *page)

{

	struct extent_io_tree *tree;

	u64 start = (u64)page->index << PAGE_CACHE_SHIFT;

	u64 start = page_offset(page);

	u64 found_start;

	struct extent_buffer *eb;

fs/btrfs/extent_io.c

+11 −13
Original line number Diff line number Diff line
@@ -1834,7 +1834,7 @@ int test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, 
 */

static void check_page_uptodate(struct extent_io_tree *tree, struct page *page)

{

	u64 start = (u64)page->index << PAGE_CACHE_SHIFT;

	u64 start = page_offset(page);

	u64 end = start + PAGE_CACHE_SIZE - 1;

	if (test_range_bit(tree, start, end, EXTENT_UPTODATE, 1, NULL))

		SetPageUptodate(page);
@@ -1846,7 +1846,7 @@ static void check_page_uptodate(struct extent_io_tree *tree, struct page *page) 
 */

static void check_page_locked(struct extent_io_tree *tree, struct page *page)

{

	u64 start = (u64)page->index << PAGE_CACHE_SHIFT;

	u64 start = page_offset(page);

	u64 end = start + PAGE_CACHE_SIZE - 1;

	if (!test_range_bit(tree, start, end, EXTENT_LOCKED, 0, NULL))

		unlock_page(page);
@@ -2293,8 +2293,7 @@ static void end_bio_extent_writepage(struct bio *bio, int err) 
		struct page *page = bvec->bv_page;

		tree = &BTRFS_I(page->mapping->host)->io_tree;



		start = ((u64)page->index << PAGE_CACHE_SHIFT) +

			 bvec->bv_offset;

		start = page_offset(page) + bvec->bv_offset;

		end = start + bvec->bv_len - 1;



		if (bvec->bv_offset == 0 && bvec->bv_len == PAGE_CACHE_SIZE)
@@ -2353,8 +2352,7 @@ static void end_bio_extent_readpage(struct bio *bio, int err) 
			 (long int)bio->bi_bdev);

		tree = &BTRFS_I(page->mapping->host)->io_tree;



		start = ((u64)page->index << PAGE_CACHE_SHIFT) +

			bvec->bv_offset;

		start = page_offset(page) + bvec->bv_offset;

		end = start + bvec->bv_len - 1;



		if (bvec->bv_offset == 0 && bvec->bv_len == PAGE_CACHE_SIZE)
@@ -2471,7 +2469,7 @@ static int __must_check submit_one_bio(int rw, struct bio *bio, 
	struct extent_io_tree *tree = bio->bi_private;

	u64 start;



	start = ((u64)page->index << PAGE_CACHE_SHIFT) + bvec->bv_offset;

	start = page_offset(page) + bvec->bv_offset;



	bio->bi_private = NULL;
@@ -2595,7 +2593,7 @@ static int __extent_read_full_page(struct extent_io_tree *tree, 
				   unsigned long *bio_flags)

{

	struct inode *inode = page->mapping->host;

	u64 start = (u64)page->index << PAGE_CACHE_SHIFT;

	u64 start = page_offset(page);

	u64 page_end = start + PAGE_CACHE_SIZE - 1;

	u64 end;

	u64 cur = start;
@@ -2806,7 +2804,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, 
	struct inode *inode = page->mapping->host;

	struct extent_page_data *epd = data;

	struct extent_io_tree *tree = epd->tree;

	u64 start = (u64)page->index << PAGE_CACHE_SHIFT;

	u64 start = page_offset(page);

	u64 delalloc_start;

	u64 page_end = start + PAGE_CACHE_SIZE - 1;

	u64 end;
@@ -3674,7 +3672,7 @@ int extent_invalidatepage(struct extent_io_tree *tree, 
			  struct page *page, unsigned long offset)

{

	struct extent_state *cached_state = NULL;

	u64 start = ((u64)page->index << PAGE_CACHE_SHIFT);

	u64 start = page_offset(page);

	u64 end = start + PAGE_CACHE_SIZE - 1;

	size_t blocksize = page->mapping->host->i_sb->s_blocksize;
@@ -3700,7 +3698,7 @@ int try_release_extent_state(struct extent_map_tree *map, 
			     struct extent_io_tree *tree, struct page *page,

			     gfp_t mask)

{

	u64 start = (u64)page->index << PAGE_CACHE_SHIFT;

	u64 start = page_offset(page);

	u64 end = start + PAGE_CACHE_SIZE - 1;

	int ret = 1;
@@ -3739,7 +3737,7 @@ int try_release_extent_mapping(struct extent_map_tree *map, 
			       gfp_t mask)

{

	struct extent_map *em;

	u64 start = (u64)page->index << PAGE_CACHE_SHIFT;

	u64 start = page_offset(page);

	u64 end = start + PAGE_CACHE_SIZE - 1;



	if ((mask & __GFP_WAIT) &&

fs/btrfs/inode.c

+2 −3
Original line number Diff line number Diff line
@@ -2062,7 +2062,7 @@ static int btrfs_writepage_end_io_hook(struct page *page, u64 start, u64 end, 
static int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end,

			       struct extent_state *state, int mirror)

{

	size_t offset = start - ((u64)page->index << PAGE_CACHE_SHIFT);

	size_t offset = start - page_offset(page);

	struct inode *inode = page->mapping->host;

	struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;

	char *kaddr;
@@ -6752,8 +6752,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned long offset) 
		return;

	}

	lock_extent_bits(tree, page_start, page_end, 0, &cached_state);

	ordered = btrfs_lookup_ordered_extent(inode,

					   page_offset(page));

	ordered = btrfs_lookup_ordered_extent(inode, page_offset(page));

	if (ordered) {

		/*

		 * IO on this page will never be started, so we need

fs/btrfs/relocation.c

+1 −1
Original line number Diff line number Diff line
@@ -3017,7 +3017,7 @@ static int relocate_file_extent_cluster(struct inode *inode, 
			}

		}



		page_start = (u64)page->index << PAGE_CACHE_SHIFT;

		page_start = page_offset(page);

		page_end = page_start + PAGE_CACHE_SIZE - 1;



		lock_extent(&BTRFS_I(inode)->io_tree, page_start, page_end);