1 files changed, 12 insertions, 16 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 89f5be2bfb43..58a18ed11546 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -26,6 +26,7 @@
 #include "volumes.h"
 #include "qgroup.h"
 #include "compression.h"
+#include "delalloc-space.h"
 
 static struct kmem_cache *btrfs_inode_defrag_cachep;
 /*
@@ -1550,30 +1551,20 @@ static noinline int check_can_nocow(struct btrfs_inode *inode, loff_t pos,
 {
         struct btrfs_fs_info *fs_info = inode->root->fs_info;
         struct btrfs_root *root = inode->root;
-        struct btrfs_ordered_extent *ordered;
         u64 lockstart, lockend;
         u64 num_bytes;
         int ret;
 
         ret = btrfs_start_write_no_snapshotting(root);
         if (!ret)
-                return -ENOSPC;
+                return -EAGAIN;
 
         lockstart = round_down(pos, fs_info->sectorsize);
         lockend = round_up(pos + *write_bytes,
                            fs_info->sectorsize) - 1;
 
-        while (1) {
-                lock_extent(&inode->io_tree, lockstart, lockend);
-                ordered = btrfs_lookup_ordered_range(inode, lockstart,
-                                                     lockend - lockstart + 1);
-                if (!ordered) {
-                        break;
-                }
-                unlock_extent(&inode->io_tree, lockstart, lockend);
-                btrfs_start_ordered_extent(&inode->vfs_inode, ordered, 1);
-                btrfs_put_ordered_extent(ordered);
-        }
+        btrfs_lock_and_flush_ordered_range(&inode->io_tree, inode, lockstart,
+                                           lockend, NULL);
 
         num_bytes = lockend - lockstart + 1;
         ret = can_nocow_extent(&inode->vfs_inode, lockstart, &num_bytes,
@@ -2721,6 +2712,11 @@ out_only_mutex:
                  * for detecting, at fsync time, if the inode isn't yet in the
                  * log tree or it's there but not up to date.
                  */
+                struct timespec64 now = current_time(inode);
+
+                inode_inc_iversion(inode);
+                inode->i_mtime = now;
+                inode->i_ctime = now;
                 trans = btrfs_start_transaction(root, 1);
                 if (IS_ERR(trans)) {
                         err = PTR_ERR(trans);
@@ -2801,9 +2797,9 @@ static int btrfs_fallocate_update_isize(struct inode *inode,
 }
 
 enum {
-        RANGE_BOUNDARY_WRITTEN_EXTENT = 0,
-        RANGE_BOUNDARY_PREALLOC_EXTENT = 1,
-        RANGE_BOUNDARY_HOLE = 2,
+        RANGE_BOUNDARY_WRITTEN_EXTENT,
+        RANGE_BOUNDARY_PREALLOC_EXTENT,
+        RANGE_BOUNDARY_HOLE,
 };
 
 static int btrfs_zero_range_check_range_boundary(struct inode *inode,