1 files changed, 7 insertions, 4 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 23d1d811e2b2..41ca5fdaee6c 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1082,7 +1082,8 @@ static noinline int prepare_pages(struct btrfs_root *root, struct file *file,
 
 again:
         for (i = 0; i < num_pages; i++) {
-                pages[i] = grab_cache_page(inode->i_mapping, index + i);
+                pages[i] = find_or_create_page(inode->i_mapping, index + i,
+                                               GFP_NOFS);
                 if (!pages[i]) {
                         faili = i - 1;
                         err = -ENOMEM;
@@ -1239,9 +1240,11 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
                  * managed to copy.
                  */
                 if (num_pages > dirty_pages) {
-                        if (copied > 0)
-                                atomic_inc(
-                                        &BTRFS_I(inode)->outstanding_extents);
+                        if (copied > 0) {
+                                spin_lock(&BTRFS_I(inode)->lock);
+                                BTRFS_I(inode)->outstanding_extents++;
+                                spin_unlock(&BTRFS_I(inode)->lock);
+                        }
                         btrfs_delalloc_release_space(inode,
                                         (num_pages - dirty_pages) <<
                                         PAGE_CACHE_SHIFT);