1 files changed, 13 insertions, 3 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 7e85dca0e6f2..89f5be2bfb43 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2068,6 +2068,18 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
         u64 len;
 
         /*
+         * If the inode needs a full sync, make sure we use a full range to
+         * avoid log tree corruption, due to hole detection racing with ordered
+         * extent completion for adjacent ranges, and assertion failures during
+         * hole detection.
+         */
+        if (test_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
+                     &BTRFS_I(inode)->runtime_flags)) {
+                start = 0;
+                end = LLONG_MAX;
+        }
+
+        /*
          * The range length can be represented by u64, we have to do the typecasts
          * to avoid signed overflow if it's [0, LLONG_MAX] eg. from fsync()
          */
@@ -2554,10 +2566,8 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len)
 
         ret = btrfs_punch_hole_lock_range(inode, lockstart, lockend,
                                           &cached_state);
-        if (ret) {
-                inode_unlock(inode);
+        if (ret)
                 goto out_only_mutex;
-        }
 
         path = btrfs_alloc_path();
         if (!path) {