7 files changed, 46 insertions, 33 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index f7df5536ab61..72dcbf19f6ce 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3180,6 +3180,7 @@ int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput);
 int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int delay_iput,
                                int nr);
 int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end,
+                              unsigned int extra_bits,
                               struct extent_state **cached_state, int dedupe);
 int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
                              struct btrfs_root *new_root,
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index d8b27af7101e..2ef824b58e3c 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -365,10 +365,11 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
                        struct extent_state **cached_state);
 
 static inline int set_extent_delalloc(struct extent_io_tree *tree, u64 start,
-                u64 end, struct extent_state **cached_state)
+                                      u64 end, unsigned int extra_bits,
+                                      struct extent_state **cached_state)
 {
         return set_extent_bit(tree, start, end,
-                              EXTENT_DELALLOC | EXTENT_UPTODATE,
+                              EXTENT_DELALLOC | EXTENT_UPTODATE | extra_bits,
                               NULL, cached_state, GFP_NOFS);
 }
 
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 47e6ebad78c3..2de7b4f4ca3c 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -538,14 +538,34 @@ int btrfs_dirty_pages(struct inode *inode, struct page **pages,
         u64 end_of_last_block;
         u64 end_pos = pos + write_bytes;
         loff_t isize = i_size_read(inode);
+        unsigned int extra_bits = 0;
 
         start_pos = pos & ~((u64) fs_info->sectorsize - 1);
         num_bytes = round_up(write_bytes + pos - start_pos,
                              fs_info->sectorsize);
 
         end_of_last_block = start_pos + num_bytes - 1;
+
+        if (!btrfs_is_free_space_inode(BTRFS_I(inode))) {
+                if (start_pos >= isize &&
+                    !(BTRFS_I(inode)->flags & BTRFS_INODE_PREALLOC)) {
+                        /*
+                         * There can't be any extents following eof in this case
+                         * so just set the delalloc new bit for the range
+                         * directly.
+                         */
+                        extra_bits |= EXTENT_DELALLOC_NEW;
+                } else {
+                        err = btrfs_find_new_delalloc_bytes(BTRFS_I(inode),
+                                                            start_pos,
+                                                            num_bytes, cached);
+                        if (err)
+                                return err;
+                }
+        }
+
         err = btrfs_set_extent_delalloc(inode, start_pos, end_of_last_block,
-                                        cached, 0);
+                                        extra_bits, cached, 0);
         if (err)
                 return err;
 
@@ -1473,10 +1493,8 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,
                 + round_up(pos + write_bytes - start_pos,
                            fs_info->sectorsize) - 1;
 
-        if (start_pos < inode->vfs_inode.i_size ||
-            (inode->flags & BTRFS_INODE_PREALLOC)) {
+        if (start_pos < inode->vfs_inode.i_size) {
                 struct btrfs_ordered_extent *ordered;
-                unsigned int clear_bits;
 
                 lock_extent_bits(&inode->io_tree, start_pos, last_pos,
                                 cached_state);
@@ -1498,19 +1516,10 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages,
                 }
                 if (ordered)
                         btrfs_put_ordered_extent(ordered);
-                ret = btrfs_find_new_delalloc_bytes(inode, start_pos,
-                                                    last_pos - start_pos + 1,
-                                                    cached_state);
-                clear_bits = EXTENT_DIRTY | EXTENT_DELALLOC |
-                        EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG;
-                if (ret)
-                        clear_bits |= EXTENT_DELALLOC_NEW | EXTENT_LOCKED;
-                clear_extent_bit(&inode->io_tree, start_pos,
-                                 last_pos, clear_bits,
-                                 (clear_bits & EXTENT_LOCKED) ? 1 : 0,
-                                 0, cached_state, GFP_NOFS);
-                if (ret)
-                        return ret;
+                clear_extent_bit(&inode->io_tree, start_pos, last_pos,
+                                 EXTENT_DIRTY | EXTENT_DELALLOC |
+                                 EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,
+                                 0, 0, cached_state, GFP_NOFS);
                 *lockstart = start_pos;
                 *lockend = last_pos;
                 ret = 1;
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 1131db7a0b28..993061f83067 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2032,11 +2032,12 @@ static noinline int add_pending_csums(struct btrfs_trans_handle *trans,
 }
 
 int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end,
+                              unsigned int extra_bits,
                               struct extent_state **cached_state, int dedupe)
 {
         WARN_ON((end & (PAGE_SIZE - 1)) == 0);
         return set_extent_delalloc(&BTRFS_I(inode)->io_tree, start, end,
-                                   cached_state);
+                                   extra_bits, cached_state);
 }
 
 /* see btrfs_writepage_start_hook for details on why this is required */
@@ -2097,7 +2098,7 @@ again:
                 goto out;
          }
 
-        btrfs_set_extent_delalloc(inode, page_start, page_end, &cached_state,
+        btrfs_set_extent_delalloc(inode, page_start, page_end, 0, &cached_state,
                                   0);
         ClearPageChecked(page);
         set_page_dirty(page);
@@ -4797,7 +4798,7 @@ again:
                           EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,
                           0, 0, &cached_state, GFP_NOFS);
 
-        ret = btrfs_set_extent_delalloc(inode, block_start, block_end,
+        ret = btrfs_set_extent_delalloc(inode, block_start, block_end, 0,
                                         &cached_state, 0);
         if (ret) {
                 unlock_extent_cached(io_tree, block_start, block_end,
@@ -9163,7 +9164,7 @@ again:
                           EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,
                           0, 0, &cached_state, GFP_NOFS);
 
-        ret = btrfs_set_extent_delalloc(inode, page_start, end,
+        ret = btrfs_set_extent_delalloc(inode, page_start, end, 0,
                                         &cached_state, 0);
         if (ret) {
                 unlock_extent_cached(io_tree, page_start, page_end,
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 4cf2eb67eba6..f0c3f00e97cb 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3268,7 +3268,8 @@ static int relocate_file_extent_cluster(struct inode *inode,
                         nr++;
                 }
 
-                btrfs_set_extent_delalloc(inode, page_start, page_end, NULL, 0);
+                btrfs_set_extent_delalloc(inode, page_start, page_end, 0, NULL,
+                                          0);
                 set_page_dirty(page);
 
                 unlock_extent(&BTRFS_I(inode)->io_tree,
diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index d06b1c931d05..2e7f64a3b22b 100644
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -114,7 +114,7 @@ static int test_find_delalloc(u32 sectorsize)
          * |--- delalloc ---|
          * |---  search  ---|
          */
-        set_extent_delalloc(&tmp, 0, sectorsize - 1, NULL);
+        set_extent_delalloc(&tmp, 0, sectorsize - 1, 0, NULL);
         start = 0;
         end = 0;
         found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
@@ -145,7 +145,7 @@ static int test_find_delalloc(u32 sectorsize)
                 test_msg("Couldn't find the locked page\n");
                 goto out_bits;
         }
-        set_extent_delalloc(&tmp, sectorsize, max_bytes - 1, NULL);
+        set_extent_delalloc(&tmp, sectorsize, max_bytes - 1, 0, NULL);
         start = test_start;
         end = 0;
         found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
@@ -200,7 +200,7 @@ static int test_find_delalloc(u32 sectorsize)
          *
          * We are re-using our test_start from above since it works out well.
          */
-        set_extent_delalloc(&tmp, max_bytes, total_dirty - 1, NULL);
+        set_extent_delalloc(&tmp, max_bytes, total_dirty - 1, 0, NULL);
         start = test_start;
         end = 0;
         found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
diff --git a/fs/btrfs/tests/inode-tests.c b/fs/btrfs/tests/inode-tests.c
index f797642c013d..30affb60da51 100644
--- a/fs/btrfs/tests/inode-tests.c
+++ b/fs/btrfs/tests/inode-tests.c
@@ -968,7 +968,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
         btrfs_test_inode_set_ops(inode);
 
         /* [BTRFS_MAX_EXTENT_SIZE] */
-        ret = btrfs_set_extent_delalloc(inode, 0, BTRFS_MAX_EXTENT_SIZE - 1,
+        ret = btrfs_set_extent_delalloc(inode, 0, BTRFS_MAX_EXTENT_SIZE - 1, 0,
                                         NULL, 0);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
@@ -984,7 +984,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
         /* [BTRFS_MAX_EXTENT_SIZE][sectorsize] */
         ret = btrfs_set_extent_delalloc(inode, BTRFS_MAX_EXTENT_SIZE,
                                         BTRFS_MAX_EXTENT_SIZE + sectorsize - 1,
-                                        NULL, 0);
+                                        0, NULL, 0);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
                 goto out;
@@ -1018,7 +1018,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
         ret = btrfs_set_extent_delalloc(inode, BTRFS_MAX_EXTENT_SIZE >> 1,
                                         (BTRFS_MAX_EXTENT_SIZE >> 1)
                                         + sectorsize - 1,
-                                        NULL, 0);
+                                        0, NULL, 0);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
                 goto out;
@@ -1036,7 +1036,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
         ret = btrfs_set_extent_delalloc(inode,
                         BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize,
                         (BTRFS_MAX_EXTENT_SIZE << 1) + 3 * sectorsize - 1,
-                        NULL, 0);
+                        0, NULL, 0);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
                 goto out;
@@ -1053,7 +1053,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
         */
         ret = btrfs_set_extent_delalloc(inode,
                         BTRFS_MAX_EXTENT_SIZE + sectorsize,
-                        BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, NULL, 0);
+                        BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, 0, NULL, 0);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
                 goto out;
@@ -1089,7 +1089,7 @@ static int test_extent_accounting(u32 sectorsize, u32 nodesize)
          */
         ret = btrfs_set_extent_delalloc(inode,
                         BTRFS_MAX_EXTENT_SIZE + sectorsize,
-                        BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, NULL, 0);
+                        BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, 0, NULL, 0);
         if (ret) {
                 test_msg("btrfs_set_extent_delalloc returned %d\n", ret);
                 goto out;