1 files changed, 25 insertions, 43 deletions

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 1b319df29eee..5c00d6aeae75 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -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);
@@ -1960,7 +1960,7 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 start,
                 return -EIO;
         }
         bio->bi_bdev = dev->bdev;
-        bio_add_page(bio, page, length, start-page_offset(page));
+        bio_add_page(bio, page, length, start - page_offset(page));
         btrfsic_submit_bio(WRITE_SYNC, bio);
         wait_for_completion(&compl);
 
@@ -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;
@@ -2648,6 +2646,8 @@ static int __extent_read_full_page(struct extent_io_tree *tree,
                 }
         }
         while (cur <= end) {
+                unsigned long pnr = (last_byte >> PAGE_CACHE_SHIFT) + 1;
+
                 if (cur >= last_byte) {
                         char *userpage;
                         struct extent_state *cached = NULL;
@@ -2735,26 +2735,17 @@ static int __extent_read_full_page(struct extent_io_tree *tree,
                         continue;
                 }
 
-                ret = 0;
-                if (tree->ops && tree->ops->readpage_io_hook) {
-                        ret = tree->ops->readpage_io_hook(page, cur,
-                                                          cur + iosize - 1);
-                }
-                if (!ret) {
-                        unsigned long pnr = (last_byte >> PAGE_CACHE_SHIFT) + 1;
-                        pnr -= page->index;
-                        ret = submit_extent_page(READ, tree, page,
+                pnr -= page->index;
+                ret = submit_extent_page(READ, tree, page,
                                          sector, disk_io_size, pg_offset,
                                          bdev, bio, pnr,
                                          end_bio_extent_readpage, mirror_num,
                                          *bio_flags,
                                          this_bio_flag);
-                        if (!ret) {
-                                nr++;
-                                *bio_flags = this_bio_flag;
-                        }
-                }
-                if (ret) {
+                if (!ret) {
+                        nr++;
+                        *bio_flags = this_bio_flag;
+                } else {
                         SetPageError(page);
                         unlock_extent(tree, cur, cur + iosize - 1);
                 }
@@ -2806,7 +2797,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;
@@ -3124,12 +3115,9 @@ static int lock_extent_buffer_for_io(struct extent_buffer *eb,
                 set_bit(EXTENT_BUFFER_WRITEBACK, &eb->bflags);
                 spin_unlock(&eb->refs_lock);
                 btrfs_set_header_flag(eb, BTRFS_HEADER_FLAG_WRITTEN);
-                spin_lock(&fs_info->delalloc_lock);
-                if (fs_info->dirty_metadata_bytes >= eb->len)
-                        fs_info->dirty_metadata_bytes -= eb->len;
-                else
-                        WARN_ON(1);
-                spin_unlock(&fs_info->delalloc_lock);
+                __percpu_counter_add(&fs_info->dirty_metadata_bytes,
+                                     -eb->len,
+                                     fs_info->dirty_metadata_batch);
                 ret = 1;
         } else {
                 spin_unlock(&eb->refs_lock);
@@ -3446,15 +3434,9 @@ retry:
                          * swizzled back from swapper_space to tmpfs file
                          * mapping
                          */
-                        if (tree->ops &&
-                            tree->ops->write_cache_pages_lock_hook) {
-                                tree->ops->write_cache_pages_lock_hook(page,
-                                                               data, flush_fn);
-                        } else {
-                                if (!trylock_page(page)) {
-                                        flush_fn(data);
-                                        lock_page(page);
-                                }
+                        if (!trylock_page(page)) {
+                                flush_fn(data);
+                                lock_page(page);
                         }
 
                         if (unlikely(page->mapping != mapping)) {
@@ -3674,7 +3656,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 +3682,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 +3721,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) &&